From f27250bf27a30003a363f4af7adafef13d8abbb7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Aug 2014 01:43:17 +0000 Subject: [PATCH 1/4] SVN_SILENT made messages (after extraction) --- src/dolphin.appdata.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/dolphin.appdata.xml b/src/dolphin.appdata.xml index fe0c774e6..8476d6538 100644 --- a/src/dolphin.appdata.xml +++ b/src/dolphin.appdata.xml @@ -16,6 +16,7 @@ Dolphin Dolphin Dolphin + Dolphin Dolphin Dolphin Dolphin @@ -47,6 +48,7 @@ Gestionnaire de fichier Gerente de File Gestore file + 파일 관리자 Failų tvarkyklė Filbehandler Dateipleger @@ -77,6 +79,7 @@

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.

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.

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.

+

Dolphin은 가벼운 파일 관리자입니다. 사용 편의성과 간단함을 위주로 설계되었으며, 유연성과 사용자 정의 가능성을 배제하지 않았습니다. 원하는 대로 파일을 관리할 수 있습니다.

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.

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.

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.

@@ -106,6 +109,7 @@

Fonctionnalités :

Characteristicas:

Funzionalità:

+

기능:

Galimybės

Egenskaper:

Markmalen:

@@ -135,6 +139,7 @@
  • Barre de navigation (ou fil d'Ariane) permettant de naviguer rapidement dans la hiérarchie de fichiers et de dossiers.
  • Barra de navigation (o "breadcrumb") pro URLs, que il permitte te navigar rapidemente a transverso del hierarchia de files e dossieres.
  • La barra di navigazione per gli URL, che ti consente di navigare rapidamente attraverso la struttura di file e cartelle.
    • +
  • 파일과 폴더 구조를 빠르게 탐색할 수 있도록 URL 탐색 표시줄을 사용할 수 있습니다.
  • Navigasjonslinje (brødsmulelinje) for URL-er slik at du raskt kan navigere gjennom hierarkiet av filer og mapper.
  • Steed- (oder Krömelspoor-)Balken för URLs, mit de Du Di fix dör de Hierarchie ut Dateien un Ornern bewegen kannst
  • Navigatie- (of broodkruimel)balk voor URL's, waarmee u snel kunt navigeren door de hiërarchie van bestanden en mappen.
    • @@ -162,6 +167,7 @@
  • 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.
  • Il supporta multe differente typos de stilos de vista e proprietates e il permitte te configurar le vista exactemente como tu vole.
  • Supporta diversi stili di visualizzazione e proprietà e ti consente di configurare la vista come desideri.
    • +
  • 여러 종류의 보기 형식을 지원하여 원하는 대로 항목을 볼 수 있습니다.
  • Støtter flere forskjellige visningsstiler og kan sette opp visningen akkurat slik du vil ha den.
  • Ünnerstütt en Reeg verscheden Ansichtstilen un -egenschappen un lett Di de Ansicht jüst so topassen, as Du dat bruukst.
  • 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.
    • @@ -189,6 +195,7 @@
  • Affichage divisé, permettant de facilement copier ou déplacer des fichiers dans les différents emplacements.
  • Scinde vista, il permitte te copiar o mover facilemente files inter locationes.
  • La vista divisa, che ti consente di copiare o spostare i file tra le diverse posizioni in maniera semplice.
    • +
  • 화면을 나누어서 서로 다른 위치 간 파일을 쉽게 이동하거나 복사할 수 있도록 합니다.
  • Delt visning, så du lett kan kopiere eller flytte filer mellom steder.
  • Deelt Ansicht, mit De Du Dateien eenfach twischen Steden koperen oder bewegen kannst.
  • Gesplitst beeld, waarmee u gemakkelijk bestanden kunt kopiëren of verplaatsen tussen locaties.
    • @@ -216,6 +223,7 @@
  • Des informations supplémentaires et des raccourcis sont disponible comme panneaux ancrable librement déplaçable et affichant exactement ce que vous voulez.
  • 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.
  • Informazioni aggiuntive e scorciatoie sono disponibili come pannelli agganciabili, che possono essere spostati liberamente e visualizzare esattamente ciò che desideri.
    • +
  • 추가 정보 표시 창과 바로 가기는 도킹 가능한 패널 형태로 사용할 수 있으며, 원하는 곳으로 이동하여 표시할 수 있습니다.
  • Mer informasjon og snarveier er tilgjengelige som dokkbare ruter, som du kan flytte fritt rundt og bruke til å vise akkurat hva du vil.
  • Bito-Infos un Leestekens laat sik as Paneels andocken, Du kannst ehr verschuven un se jüst dat wiesen laten, wat Du weten wullt.
  • Extra informatie en sneltoetsen zijn beschikbaar als vast te zetten panelen, die u vrij kunt verplaatsen en precies kunt tonen wat u wilt.
    • @@ -244,6 +252,7 @@
  • Prise en charge des onglets multiples
  • Supporto de scheda multiple
  • Supporto di schede multiple
    • +
  • 다중 탭 지원
  • Daugelio kortelių palaikymas
  • Støtte for flere faner
  • Ünnerstütten för Paneels
    • @@ -273,6 +282,7 @@
  • Les dialogues d'information sont affiché de manière discrète.
  • Dialogos de information es monstrate de modo non importun.
  • Le finestre informative sono visualizzate in modo molto discreto.
    • +
  • 정보 대화 상자를 방해되지 않는 형태로 표시합니다.
  • Informasjonsdialoger vises på en lite påtrengende måte.
  • Informatschoondialogen kaamt Di nich in'n Weg.
  • Informatiedialogen worden op een prettige manier getoond.
    • @@ -300,6 +310,7 @@
  • Prise en charge d'annulation et recommencement
  • Supporto de annulla/reface
  • Supporto di annulla/rifai
    • +
  • 실행 취소/다시 실행 지원
  • Støtte for angring/omgjøring
  • Ünnerstütten för Torüchnehmen un Wedderherstellen
  • Ondersteuning ongedaan maken/opnieuw
    • @@ -329,6 +340,7 @@
  • Accès au réseau transparent grâce au système des KIO.
  • Accesso de rete transparente a transverso del systema KIO.
  • Accesso trasparente alla rete tramite il sistema KIO.
    • +
  • KIO 시스템을 통하여 네트워크 자원에 접근합니다.
  • Gjennomsiktig nettverkstilgang via KIO-systemet.
  • Direkt Nettwarktogriep över dat KDE-In-/Utgaav-(KIO-)Moduulsysteem
  • Transparante toegang tot het netwerk via het KIO systeem.
    • From dc378935d3f92c45a48349d08f96cac63411fd50 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 27 Aug 2014 22:40:06 +0200 Subject: [PATCH 2/4] Only keep the active view container connected with the main window, all inactive view containers are disconnected. Changing the connections is done whenever the active view has been changed, so we can always guarantee that the active view is connected. The problem with restoring saved sessions is, that we create a new view container in DolphinTabPage::restoreState() when split view was used in the previous session, but this view container isn't connected to the main window slots because DolphinMainWindow::connectViewSignals() is not called for this container. This leads to these strange problems: no context menu, ... BUG: 338549 REVIEW: 119961 FIXED-IN: 4.14.1 --- src/dolphinmainwindow.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index db4ad0765..a4e43a983 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -409,14 +409,6 @@ void DolphinMainWindow::openNewTab(const KUrl& primaryUrl, const KUrl& secondary const bool placesSelectorVisible = !placesDock || !placesDock->isVisible(); tabPage->setPlacesSelectorVisible(placesSelectorVisible); - DolphinViewContainer* primaryContainer = tabPage->primaryViewContainer(); - connectViewSignals(primaryContainer); - - if (tabPage->splitViewEnabled()) { - DolphinViewContainer* secondaryContainer = tabPage->secondaryViewContainer(); - connectViewSignals(secondaryContainer); - } - tabPage->hide(); m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(primaryUrl)), @@ -701,10 +693,6 @@ void DolphinMainWindow::toggleSplitView() DolphinTabPage* tabPage = m_viewTab.at(m_tabIndex); tabPage->setSplitViewEnabled(!tabPage->splitViewEnabled()); - if (tabPage->splitViewEnabled()) { - connectViewSignals(tabPage->secondaryViewContainer()); - } - updateViewActions(); } @@ -1260,7 +1248,17 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain return; } + if (m_activeViewContainer) { + // Disconnect all signals between the old view container (container, + // view and url navigator) and main window. + m_activeViewContainer->disconnect(this); + m_activeViewContainer->view()->disconnect(this); + m_activeViewContainer->urlNavigator()->disconnect(this); + } + m_activeViewContainer = viewContainer; + connectViewSignals(viewContainer); + m_actionHandler->setCurrentView(viewContainer->view()); updateHistory(); From c98e014d2a498cd08e650331a00ae5e096715196 Mon Sep 17 00:00:00 2001 From: kdeuser 56 Date: Tue, 2 Sep 2014 21:37:41 +0200 Subject: [PATCH 3/4] Rename "Recently Accessed" to "Recently Saved" In dolphin the Section that leads you to timeline claims to show "Recently Accessed", which is not true, it shows "Recently Saved" instead. BUG: 304854 REVIEW: 119986 --- src/panels/places/placesitem.cpp | 18 ++++++++--------- src/panels/places/placesitem.h | 2 +- src/panels/places/placesitemmodel.cpp | 28 +++++++++++++-------------- src/panels/places/placespanel.cpp | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 539b9263d..173da29c5 100644 --- 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"))) { diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h index 297f12d91..4c636ec63 100644 --- a/src/panels/places/placesitem.h +++ b/src/panels/places/placesitem.h @@ -44,7 +44,7 @@ public: { PlacesType, SearchForType, - RecentlyAccessedType, + RecentlySavedType, DevicesType }; diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index dc2b95c36..d906118f2 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -58,7 +58,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. @@ -741,7 +741,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 placesItems; - QList recentlyAccessedItems; + QList recentlySavedItems; QList searchForItems; QList devicesItems; @@ -766,11 +766,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; } } } @@ -785,11 +785,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; } } } @@ -803,7 +803,7 @@ void PlacesItemModel::loadBookmarks() QList items; items.append(placesItems); - items.append(recentlyAccessedItems); + items.append(recentlySavedItems); items.append(searchForItems); items.append(devicesItems); @@ -848,7 +848,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); @@ -857,11 +857,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)); diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index f19fa1e25..720e07ce3 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -335,7 +335,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; } From c19c4590cfd5e66a1ae8ec4acc4d5adf226be90a Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 10 Sep 2014 00:23:04 +0200 Subject: [PATCH 4/4] Set the focus to the active view if the current tab has been changed. BUG: 338892 FIXED-IN: 4.15.0 REVIEW: 120125 --- src/dolphintabwidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp index b1b2d858f..c6607e529 100644 --- 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)