Merge branch 'master' into frameworks

2024-07-15 18:01:11 +00:00 · 2014-09-10 10:08:20 +02:00 · 2014-09-10 10:08:20 +02:00 · 39cfd051ef
parent 42153e55e6 c19c4590cf
commit 39cfd051ef
7 changed files with 44 additions and 31 deletions
--- a/docs/index.docbook
+++ b/docs/index.docbook
@ -192,7 +192,7 @@ The <link linkend="places-panel"><guilabel>Places</guilabel> panel</link>, which
 provides quick access to bookmarked locations and disks or other media.
 </para>
 <para>If desktop search and file indexing are enabled in the <guilabel>Desktop Search</guilabel> 
-module in the &systemsettings; the panel provides <guilabel>Recently Accessed</guilabel> 
+module in the &systemsettings; the panel provides <guilabel>Recently Saved</guilabel> 
 items and allows you to search for <guilabel>Documents</guilabel>, <guilabel>Images</guilabel>,
 <guilabel>Audio Files</guilabel> and <guilabel>Video</guilabel>.
 </para></listitem>
@ -690,7 +690,7 @@ to a different position, even outside the window.
 <title>Places</title>
 <!--FIXME difference between places panel in dolphin + kde filedialog + konqueror:
 context menu Icon Size? No different entries ?-->
-<!--Four groups: Places = Folders, Devices, with Nepomuk Recently Accessed and Search For -->
+<!--Four groups: Places = Folders, Devices, with Baloo Recently Saved and Search For -->
 <para>
 The <guilabel>Places</guilabel> panel is located at the left of the window by
 default. The <guilabel>Places</guilabel> panel shows any locations you have
@ -800,10 +800,10 @@ Start to type into the find input box and the search starts immediately.
 (<userinput>*foo*</userinput> and <userinput>foo</userinput> are equivalent), 
 but you can use wildcards inside the search term. <userinput>*</userinput> will match 
 zero or more characters, <userinput>?</userinput> only one single character.</para>
-<para>This feature can be used with running Nepomuk/Strigi services; without these services
+<para>This feature can be used with running Baloo services; without these services
 a KIOSlave is launched to provide the search results.</para>
-<para>The option from <guilabel>Everywhere</guilabel> with activated Nepomuk/Strigi 
-services searches in all indexed folders, without Nepomuk/Strigi this option  
+<para>The option from <guilabel>Everywhere</guilabel> with activated Baloo 
+services searches in all indexed folders, without Baloo this option  
 starts the search from the user's <replaceable>Home</replaceable> folder.</para>

 <screenshot>
@ -828,7 +828,7 @@ the user to shrink the number of search results.</para>
  a time period and rating<!--FIXME readd when again implemented: and tag, if you have defined any.--></para>

 <para>Alternatively you can use these options in the <guilabel>Places</guilabel> panel 
-together with the <guilabel>Filter</guilabel> bar to find files using Nepomuk or limit 
+together with the <guilabel>Filter</guilabel> bar to find files using Baloo or limit 
 the search to files matching the filter expression.</para>

 </sect2>
--- a/src/dolphin.appdata.xml
+++ b/src/dolphin.appdata.xml
@ -16,6 +16,7 @@
  <name xml:lang="fr">Dolphin</name>
  <name xml:lang="ia">Dolphin</name>
  <name xml:lang="it">Dolphin</name>
+  <name xml:lang="ko">Dolphin</name>
  <name xml:lang="lt">Dolphin</name>
  <name xml:lang="nb">Dolphin</name>
  <name xml:lang="nds">Dolphin</name>
@ -47,6 +48,7 @@
  <summary xml:lang="fr">Gestionnaire de fichier</summary>
  <summary xml:lang="ia">Gerente de File</summary>
  <summary xml:lang="it">Gestore file</summary>
+  <summary xml:lang="ko">파일 관리자</summary>
  <summary xml:lang="lt">Failų tvarkyklė</summary>
  <summary xml:lang="nb">Filbehandler</summary>
  <summary xml:lang="nds">Dateipleger</summary>
@ -77,6 +79,7 @@
    <p xml:lang="fr">Dolphin est un gestionnaire de fichier léger. Il a été conçu en gardant à l'esprit la simplicité et l'aisance à l'usage, tout en permettant flexibilité et personnalisation. Cela signifie que vous pouvez gérer vos fichiers de la manière exacte que vous voulez.</p>
    <p xml:lang="ia">Dolphin es un gerente de file legier. Il ha essite designate con facilitate de uso e simplicitate in le mente, mentre il permitte ancora flexibilitate e personalisation. Isto significa que tu pote facer le gerente de file exactemente como tu lo vole.</p>
    <p xml:lang="it">Dolphin è un gestore file leggero. È stato progettato per essere facile da utilizzare e pensando alla semplicità, garantendo al contempo flessibilità e personalizzazione. Ciò significa che puoi gestire i tuoi file come meglio desideri.</p>
+    <p xml:lang="ko">Dolphin은 가벼운 파일 관리자입니다. 사용 편의성과 간단함을 위주로 설계되었으며, 유연성과 사용자 정의 가능성을 배제하지 않았습니다. 원하는 대로 파일을 관리할 수 있습니다.</p>
    <p xml:lang="nb">Dolphin er en lettvekts filbehandler. Den er laget for å være enkel og lett å bruke, samtidig som den er fleksibel og kan tilpasses. Det betyr at du kan utføre dine filbehandlingsoppgaver akkurat slik du vil gjøre det.</p>
    <p xml:lang="nds">Dolphin is en slank Dateipleger. Dat wöör buut mit de Idee vun't eenfache Bedenen vör Ogen, bides dat liekers flexibel un topassbor wesen schull. Du kannst Dien Dateien also jüst so plegen, as Du dat wullt.</p>
    <p xml:lang="nl">Dolphin is een lichtgewicht bestandsbeheerder. Het is ontworpen met gebruiksgemak en eenvoud in gedachte en staat toch flexibiliteit en aan te passen toe. Dit betekent dat u uw bestandsbeheer kunt doen precies op de manier zoals u dat wilt.</p>
@ -106,6 +109,7 @@
    <p xml:lang="fr">Fonctionnalités :</p>
    <p xml:lang="ia">Characteristicas:</p>
    <p xml:lang="it">Funzionalità:</p>
+    <p xml:lang="ko">기능:</p>
    <p xml:lang="lt">Galimybės</p>
    <p xml:lang="nb">Egenskaper:</p>
    <p xml:lang="nds">Markmalen:</p>
@ -135,6 +139,7 @@
      <li xml:lang="fr">Barre de navigation (ou fil d'Ariane) permettant de naviguer rapidement dans la hiérarchie de fichiers et de dossiers.</li>
      <li xml:lang="ia">Barra de navigation (o "breadcrumb") pro URLs, que il permitte te navigar rapidemente a transverso del hierarchia de files e dossieres.</li>
      <li xml:lang="it">La barra di navigazione per gli URL, che ti consente di navigare rapidamente attraverso la struttura di file e cartelle.</li>
+      <li xml:lang="ko">파일과 폴더 구조를 빠르게 탐색할 수 있도록 URL 탐색 표시줄을 사용할 수 있습니다.</li>
      <li xml:lang="nb">Navigasjonslinje (brødsmulelinje) for URL-er slik at du raskt kan navigere gjennom hierarkiet av filer og mapper.</li>
      <li xml:lang="nds">Steed- (oder Krömelspoor-)Balken för URLs, mit de Du Di fix dör de Hierarchie ut Dateien un Ornern bewegen kannst</li>
      <li xml:lang="nl">Navigatie- (of broodkruimel)balk voor URL's, waarmee u snel kunt navigeren door de hiërarchie van bestanden en mappen.</li>
@ -162,6 +167,7 @@
      <li xml:lang="fr">Prend en charge plusieurs types de styles d'affichage et de propriété et vous permet de configurer l'affichage de la manière exacte que vous voulez.</li>
      <li xml:lang="ia">Il supporta multe differente typos de stilos de vista e proprietates e il permitte te configurar le vista exactemente como tu vole.</li>
      <li xml:lang="it">Supporta diversi stili di visualizzazione e proprietà e ti consente di configurare la vista come desideri.</li>
+      <li xml:lang="ko">여러 종류의 보기 형식을 지원하여 원하는 대로 항목을 볼 수 있습니다.</li>
      <li xml:lang="nb">Støtter flere forskjellige visningsstiler og kan sette opp visningen akkurat slik du vil ha den.</li>
      <li xml:lang="nds">Ünnerstütt en Reeg verscheden Ansichtstilen un -egenschappen un lett Di de Ansicht jüst so topassen, as Du dat bruukst.</li>
      <li xml:lang="nl">Ondersteunt een aantal verschillende soorten stijlen van weergave en eigenschappen en biedt u de mogelijkheid de weergave in te stellen precies zoals u dat wilt.</li>
@ -189,6 +195,7 @@
      <li xml:lang="fr">Affichage divisé, permettant de facilement copier ou déplacer des fichiers dans les différents emplacements.</li>
      <li xml:lang="ia">Scinde vista,  il permitte te copiar o mover facilemente files inter locationes.</li>
      <li xml:lang="it">La vista divisa, che ti consente di copiare o spostare i file tra le diverse posizioni in maniera semplice.</li>
+      <li xml:lang="ko">화면을 나누어서 서로 다른 위치 간 파일을 쉽게 이동하거나 복사할 수 있도록 합니다.</li>
      <li xml:lang="nb">Delt visning, så du lett kan kopiere eller flytte filer mellom steder.</li>
      <li xml:lang="nds">Deelt Ansicht, mit De Du Dateien eenfach twischen Steden koperen oder bewegen kannst.</li>
      <li xml:lang="nl">Gesplitst beeld, waarmee u gemakkelijk bestanden kunt kopiëren of verplaatsen tussen locaties.</li>
@ -216,6 +223,7 @@
      <li xml:lang="fr">Des informations supplémentaires et des raccourcis sont disponible comme panneaux ancrable librement déplaçable et affichant exactement ce que vous voulez.</li>
      <li xml:lang="ia">Information additional e vias breve es disponibile como pannellos de basin (dock-panels), il permitte mover los liberemente e monstrar los exactemente como tu vole.</li>
      <li xml:lang="it">Informazioni aggiuntive e scorciatoie sono disponibili come pannelli agganciabili, che possono essere spostati liberamente e visualizzare esattamente ciò che desideri.</li>
+      <li xml:lang="ko">추가 정보 표시 창과 바로 가기는 도킹 가능한 패널 형태로 사용할 수 있으며, 원하는 곳으로 이동하여 표시할 수 있습니다.</li>
      <li xml:lang="nb">Mer informasjon og snarveier er tilgjengelige som dokkbare ruter, som du kan flytte fritt rundt og bruke til å vise akkurat hva du vil.</li>
      <li xml:lang="nds">Bito-Infos un Leestekens laat sik as Paneels andocken, Du kannst ehr verschuven un se jüst dat wiesen laten, wat Du weten wullt.</li>
      <li xml:lang="nl">Extra informatie en sneltoetsen zijn beschikbaar als vast te zetten panelen, die u vrij kunt verplaatsen en precies kunt tonen wat u wilt.</li>
@ -244,6 +252,7 @@
      <li xml:lang="fr">Prise en charge des onglets multiples</li>
      <li xml:lang="ia">Supporto de scheda multiple</li>
      <li xml:lang="it">Supporto di schede multiple</li>
+      <li xml:lang="ko">다중 탭 지원</li>
      <li xml:lang="lt">Daugelio kortelių palaikymas</li>
      <li xml:lang="nb">Støtte for flere faner</li>
      <li xml:lang="nds">Ünnerstütten för Paneels</li>
@ -273,6 +282,7 @@
      <li xml:lang="fr">Les dialogues d'information sont affiché de manière discrète.</li>
      <li xml:lang="ia">Dialogos de information es monstrate de modo non importun.</li>
      <li xml:lang="it">Le finestre informative sono visualizzate in modo molto discreto.</li>
+      <li xml:lang="ko">정보 대화 상자를 방해되지 않는 형태로 표시합니다.</li>
      <li xml:lang="nb">Informasjonsdialoger vises på en lite påtrengende måte.</li>
      <li xml:lang="nds">Informatschoondialogen kaamt Di nich in'n Weg.</li>
      <li xml:lang="nl">Informatiedialogen worden op een prettige manier getoond.</li>
@ -300,6 +310,7 @@
      <li xml:lang="fr">Prise en charge d'annulation et recommencement</li>
      <li xml:lang="ia">Supporto de annulla/reface</li>
      <li xml:lang="it">Supporto di annulla/rifai</li>
+      <li xml:lang="ko">실행 취소/다시 실행 지원</li>
      <li xml:lang="nb">Støtte for angring/omgjøring</li>
      <li xml:lang="nds">Ünnerstütten för Torüchnehmen un Wedderherstellen</li>
      <li xml:lang="nl">Ondersteuning ongedaan maken/opnieuw</li>
@ -329,6 +340,7 @@
      <li xml:lang="fr">Accès au réseau transparent grâce au système des KIO.</li>
      <li xml:lang="ia">Accesso de rete transparente a transverso del systema KIO.</li>
      <li xml:lang="it">Accesso trasparente alla rete tramite il sistema KIO.</li>
+      <li xml:lang="ko">KIO 시스템을 통하여 네트워크 자원에 접근합니다.</li>
      <li xml:lang="nb">Gjennomsiktig nettverkstilgang via KIO-systemet.</li>
      <li xml:lang="nds">Direkt Nettwarktogriep över dat KDE-In-/Utgaav-(KIO-)Moduulsysteem</li>
      <li xml:lang="nl">Transparante toegang tot het netwerk via het KIO systeem.</li>
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@ -315,6 +315,7 @@ void DolphinTabWidget::currentTabChanged(int index)
    DolphinViewContainer* viewContainer = tabPageAt(index)->activeViewContainer();
    emit activeViewChanged(viewContainer);
    emit currentUrlChanged(viewContainer->url());
+    viewContainer->view()->setFocus();
 }

 void DolphinTabWidget::tabInserted(int index)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@ -144,20 +144,20 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
    const GroupType type = groupType();
    if (icon().isEmpty()) {
        switch (type) {
-        case RecentlyAccessedType: setIcon("chronometer"); break;
-        case SearchForType:        setIcon("nepomuk"); break;
+        case RecentlySavedType: setIcon("chronometer"); break;
+        case SearchForType:     setIcon("nepomuk"); break;
        case PlacesType:
-        default:                   setIcon("folder");
+        default:                setIcon("folder");
        }

    }

    switch (type) {
-    case PlacesType:           setGroup(i18nc("@item", "Places")); break;
-    case RecentlyAccessedType: setGroup(i18nc("@item", "Recently Accessed")); break;
-    case SearchForType:        setGroup(i18nc("@item", "Search For")); break;
-    case DevicesType:          setGroup(i18nc("@item", "Devices")); break;
-    default:                   Q_ASSERT(false); break;
+    case PlacesType:        setGroup(i18nc("@item", "Places")); break;
+    case RecentlySavedType: setGroup(i18nc("@item", "Recently Saved")); break;
+    case SearchForType:     setGroup(i18nc("@item", "Search For")); break;
+    case DevicesType:       setGroup(i18nc("@item", "Devices")); break;
+    default:                Q_ASSERT(false); break;
    }

    setHidden(bookmark.metaDataItem("IsHidden") == QLatin1String("true"));
@ -173,7 +173,7 @@ PlacesItem::GroupType PlacesItem::groupType() const
    if (udi().isEmpty()) {
        const QString protocol = url().protocol();
        if (protocol == QLatin1String("timeline")) {
-            return RecentlyAccessedType;
+            return RecentlySavedType;
        }

        if (protocol.contains(QLatin1String("search"))) {
--- a/src/panels/places/placesitem.h
+++ b/src/panels/places/placesitem.h
@ -44,7 +44,7 @@ public:
    {
        PlacesType,
        SearchForType,
-        RecentlyAccessedType,
+        RecentlySavedType,
        DevicesType
    };

--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@ -59,7 +59,7 @@

 namespace {
    // As long as KFilePlacesView from kdelibs is available in parallel, the
-    // system-bookmarks for "Recently Accessed" and "Search For" should be
+    // system-bookmarks for "Recently Saved" and "Search For" should be
    // shown only inside the Places Panel. This is necessary as the stored
    // URLs needs to get translated to a Baloo-search-URL on-the-fly to
    // be independent from changes in the Baloo-search-URL-syntax.
@ -738,7 +738,7 @@ void PlacesItemModel::loadBookmarks()
    // items should always be collected in one group so the items are collected first
    // in separate lists before inserting them.
    QList<PlacesItem*> placesItems;
-    QList<PlacesItem*> recentlyAccessedItems;
+    QList<PlacesItem*> recentlySavedItems;
    QList<PlacesItem*> searchForItems;
    QList<PlacesItem*> devicesItems;

@ -763,11 +763,11 @@ void PlacesItemModel::loadBookmarks()
                }

                switch (item->groupType()) {
-                case PlacesItem::PlacesType:           placesItems.append(item); break;
-                case PlacesItem::RecentlyAccessedType: recentlyAccessedItems.append(item); break;
-                case PlacesItem::SearchForType:        searchForItems.append(item); break;
+                case PlacesItem::PlacesType:        placesItems.append(item); break;
+                case PlacesItem::RecentlySavedType: recentlySavedItems.append(item); break;
+                case PlacesItem::SearchForType:     searchForItems.append(item); break;
                case PlacesItem::DevicesType:
-                default:                               Q_ASSERT(false); break;
+                default:                            Q_ASSERT(false); break;
                }
            }
        }
@ -782,11 +782,11 @@ void PlacesItemModel::loadBookmarks()
            if (missingSystemBookmarks.contains(data.url)) {
                PlacesItem* item = createSystemPlacesItem(data);
                switch (item->groupType()) {
-                case PlacesItem::PlacesType:           placesItems.append(item); break;
-                case PlacesItem::RecentlyAccessedType: recentlyAccessedItems.append(item); break;
-                case PlacesItem::SearchForType:        searchForItems.append(item); break;
+                case PlacesItem::PlacesType:        placesItems.append(item); break;
+                case PlacesItem::RecentlySavedType: recentlySavedItems.append(item); break;
+                case PlacesItem::SearchForType:     searchForItems.append(item); break;
                case PlacesItem::DevicesType:
-                default:                               Q_ASSERT(false); break;
+                default:                            Q_ASSERT(false); break;
                }
            }
        }
@ -800,7 +800,7 @@ void PlacesItemModel::loadBookmarks()

    QList<PlacesItem*> items;
    items.append(placesItems);
-    items.append(recentlyAccessedItems);
+    items.append(recentlySavedItems);
    items.append(searchForItems);
    items.append(devicesItems);

@ -845,7 +845,7 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da
    const QString protocol = data.url.protocol();
    if (protocol == QLatin1String("timeline") || protocol == QLatin1String("search")) {
        // As long as the KFilePlacesView from kdelibs is available, the system-bookmarks
-        // for "Recently Accessed" and "Search For" should be a setting available only
+        // for "Recently Saved" and "Search For" should be a setting available only
        // in the Places Panel (see description of AppNamePrefix for more details).
        const QString appName = KGlobal::mainComponent().componentName() + AppNamePrefix;
        bookmark.setMetaDataItem("OnlyInApp", appName);
@ -854,11 +854,11 @@ PlacesItem* PlacesItemModel::createSystemPlacesItem(const SystemBookmarkData& da
    PlacesItem* item = new PlacesItem(bookmark);
    item->setSystemItem(true);

-    // Create default view-properties for all "Search For" and "Recently Accessed" bookmarks
+    // Create default view-properties for all "Search For" and "Recently Saved" bookmarks
    // in case if the user has not already created custom view-properties for a corresponding
    // query yet.
    const bool createDefaultViewProperties = (item->groupType() == PlacesItem::SearchForType ||
-                                              item->groupType() == PlacesItem::RecentlyAccessedType) &&
+                                              item->groupType() == PlacesItem::RecentlySavedType) &&
                                              !GeneralSettings::self()->globalViewProps();
    if (createDefaultViewProperties) {
        ViewProperties props(convertedUrl(data.url));
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@ -339,7 +339,7 @@ void PlacesPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even

    const PlacesItem* destItem = m_model->placesItem(index);
    const PlacesItem::GroupType group = destItem->groupType();
-    if (group == PlacesItem::SearchForType || group == PlacesItem::RecentlyAccessedType) {
+    if (group == PlacesItem::SearchForType || group == PlacesItem::RecentlySavedType) {
        return;
    }