From c4f3c40b83344195b1c1213398edb6ecacaf98c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 16 Nov 2015 13:50:57 +0000 Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file) --- src/dolphinpart.desktop | 4 ++++ src/org.kde.dolphin.desktop | 2 ++ src/settings/kcm/kcmdolphingeneral.desktop | 5 +++++ src/settings/kcm/kcmdolphinnavigation.desktop | 5 +++++ src/settings/kcm/kcmdolphinservices.desktop | 4 ++++ src/settings/kcm/kcmdolphinviewmodes.desktop | 5 +++++ .../versioncontrol/fileviewversioncontrolplugin.desktop | 1 + 7 files changed, 26 insertions(+) diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop index 8941e84654..c088d543ac 100644 --- a/src/dolphinpart.desktop +++ b/src/dolphinpart.desktop @@ -4,6 +4,7 @@ Name=Dolphin View Name[ca]=Vista del Dolphin Name[ca@valencia]=Vista del Dolphin Name[cs]=Pohled Dolphin +Name[da]=Dolphin-visning Name[de]=Dolphin-Ansicht Name[el]=Dolphin View Name[en_GB]=Dolphin View @@ -57,6 +58,7 @@ Name=Icons Name[ca]=Icones Name[ca@valencia]=Icones Name[cs]=Ikony +Name[da]=Ikoner Name[de]=Symbole Name[el]=Εικονίδια Name[en_GB]=Icons @@ -101,6 +103,7 @@ Name=Compact Name[ca]=Compacta Name[ca@valencia]=Compacta Name[cs]=Kompaktní +Name[da]=Kompakt Name[de]=Kompakt Name[el]=Σύμπτυξη Name[en_GB]=Compact @@ -142,6 +145,7 @@ Name=Details Name[ca]=Detalls Name[ca@valencia]=Detalls Name[cs]=Podrobnosti +Name[da]=Detaljer Name[de]=Details Name[el]=Λεπτομέρειες Name[en_GB]=Details diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 63b4d1f597..9340021cf3 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -3,6 +3,7 @@ Name=Dolphin Name[ca]=Dolphin Name[ca@valencia]=Dolphin Name[cs]=Dolphin +Name[da]=Dolphin Name[de]=Dolphin Name[el]=Dolphin Name[en_GB]=Dolphin @@ -47,6 +48,7 @@ GenericName=File Manager GenericName[ca]=Gestor de fitxers GenericName[ca@valencia]=Gestor de fitxers GenericName[cs]=Správce souborů +GenericName[da]=Filhåndtering GenericName[de]=Dateiverwaltung GenericName[el]=Διαχειριστής αρχείων GenericName[en_GB]=File Manager diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 5ff155c99b..64ba41cdb8 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -2,6 +2,7 @@ Name=Dolphin General Name[ca]=General del Dolphin Name[ca@valencia]=General del Dolphin Name[cs]=Obecný Dolphin +Name[da]=Dolphin generelt Name[de]=Dolphin allgemein Name[el]=Dolphin Γενικά Name[en_GB]=Dolphin General @@ -41,6 +42,7 @@ Comment=This service allows configuration of general Dolphin settings. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de l'arranjament general del Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. +Comment[da]=Denne tjeneste muliggør konfiguration af generelle Dolphin-indstillinger. Comment[de]=Mit diesem Dienst können allgemeine Einstellungen von Dolphin eingerichtet werden. Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση των γενικών ρυθμίσεων του Dolphin Comment[en_GB]=This service allows configuration of general Dolphin settings. @@ -89,6 +91,7 @@ Name=General Name[ca]=General Name[ca@valencia]=General Name[cs]=Obecné +Name[da]=Generelt Name[de]=Allgemein Name[el]=Γενικά Name[en_GB]=General @@ -127,6 +130,7 @@ Comment=Configure general file manager settings Comment[ca]=Configura les opcions generals del gestor de fitxers Comment[ca@valencia]=Configura les opcions generals del gestor de fitxers Comment[cs]=Obecné nastavení správce souborů +Comment[da]=Konfiguration af generelle indstillinger for filhåndtering Comment[de]=Allgemeine Einstellungen an der Dateiverwaltung vornehmen Comment[el]=Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων Comment[en_GB]=Configure general file manager settings @@ -163,6 +167,7 @@ X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů +X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateiverwaltung X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index b969dcb2ac..86266ad060 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -2,6 +2,7 @@ Name=Dolphin Navigation Name[ca]=Navegació del Dolphin Name[ca@valencia]=Navegació del Dolphin Name[cs]=Navigace Dolphinu +Name[da]=Dolphin-navigation Name[de]=Dolphin-Navigation Name[el]=Dolphin Πλοήγηση Name[en_GB]=Dolphin Navigation @@ -41,6 +42,7 @@ Comment=This service allows configuration of the Dolphin navigation. Comment[ca]=Aquest servei permet la configuració de la navegació del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de la navegació del Dolphin. Comment[cs]=Tato služba umožňuje nastavení navigace v Dolphinu. +Comment[da]=Denne tjeneste muliggør konfiguration af Dolphin-navigation. Comment[de]=Mit diesem Dienst kann die Navigation für Dolphin eingerichtet werden. Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση της πλοήγησης του Dolphin Comment[en_GB]=This service allows configuration of the Dolphin navigation. @@ -88,6 +90,7 @@ Name=Navigation Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace +Name[da]=Navigation Name[de]=Navigation Name[el]=Πλοήγηση Name[en_GB]=Navigation @@ -127,6 +130,7 @@ Comment=Configure file manager navigation Comment[ca]=Configura la navegació del gestor de fitxers Comment[ca@valencia]=Configura la navegació del gestor de fitxers Comment[cs]=Nastavení navigace správce souborů +Comment[da]=Indstil navigation i filhåndtering Comment[de]=Einstellungen zur Navigation mit der Dateiverwaltung Comment[el]=Διαμόρφωση πλοήγησης του διαχειριστή αρχείων Comment[en_GB]=Configure file manager navigation @@ -165,6 +169,7 @@ X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů +X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateiverwaltung X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index c8d3cca11c..51ef1f8d23 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -2,6 +2,7 @@ Name=Dolphin Services Name[ca]=Serveis del Dolphin Name[ca@valencia]=Serveis del Dolphin Name[cs]=Služby Dolphinu +Name[da]=Dolphin-tjenester Name[de]=Dolphin-Dienste Name[el]=Dolphin Υπηρεσίες Name[en_GB]=Dolphin Services @@ -50,6 +51,7 @@ Name=Services Name[ca]=Serveis Name[ca@valencia]=Serveis Name[cs]=Služby +Name[da]=Tjenester Name[de]=KDE-Dienste Name[el]=Υπηρεσίες Name[en_GB]=Services @@ -87,6 +89,7 @@ Comment=Configure file manager services Comment[ca]=Configura els serveis del gestor de fitxers Comment[ca@valencia]=Configura els serveis del gestor de fitxers Comment[cs]=Nastavení služeb správce souborů +Comment[da]=Indstil filhåndteringstjenester Comment[de]=Dateiverwaltungs-Dienste einrichten Comment[el]=Διαμόρφωση υπηρεσιών του διαχειριστή αρχείων Comment[en_GB]=Configure file manager services @@ -124,6 +127,7 @@ X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů +X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateiverwaltung X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 9e273adc8b..a07a2a4061 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -2,6 +2,7 @@ Name=Dolphin View Modes Name[ca]=Modes de vista del Dolphin Name[ca@valencia]=Modes de vista del Dolphin Name[cs]=Režimy pohledů Dolphinu +Name[da]=Dolphins visningstilstande Name[de]=Dolphin-Ansichtsmodi Name[el]=Dolphin Λειτουργίες Προβολής Name[en_GB]=Dolphin View Modes @@ -40,6 +41,7 @@ Comment=This service allows configuration of the Dolphin view modes. Comment[ca]=Aquest servei permet la configuració dels modes de vista del Dolphin. Comment[ca@valencia]=Este servei permet la configuració dels modes de vista del Dolphin. Comment[cs]=Tato služba umožňuje nastavení režimů pohledu Dolphinu. +Comment[da]=Denne tjeneste muliggør konfiguration af Dolphins visningstilstande. Comment[de]=Mit diesem Dienst können Dolphin-Ansichtsmodi eingerichtet werden. Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση των λειτουργιών προβολής του Dolphin Comment[en_GB]=This service allows configuration of the Dolphin view modes. @@ -87,6 +89,7 @@ Name=View Modes Name[ca]=Modes de vista Name[ca@valencia]=Modes de vista Name[cs]=Režimy pohledu +Name[da]=Visningstilstande Name[de]=Ansichts-Modi Name[el]=Λειτουργίες Προβολής Name[en_GB]=View Modes @@ -126,6 +129,7 @@ Comment=Configure file manager view modes Comment[ca]=Configura els modes de vista del gestor de fitxers Comment[ca@valencia]=Configura els modes de vista del gestor de fitxers Comment[cs]=Nastavení režimů pohledu správce souborů +Comment[da]=Indstil filhåndteringens visningstilstande Comment[de]=Dateiverwaltungs-Ansichten einrichten Comment[el]=Διαμόρφωση των λειτουργιών προβολής του διαχειριστή αρχείων Comment[en_GB]=Configure file manager view modes @@ -164,6 +168,7 @@ X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů +X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateiverwaltung X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop index 172a991ac1..7abd8141ff 100644 --- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop +++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop @@ -5,6 +5,7 @@ Comment=Version Control Plugin for File Views Comment[ca]=Connector de control de versions per a les vistes de fitxers Comment[ca@valencia]=Connector de control de versions per a les vistes de fitxers Comment[cs]=Modul pro správu verzí pro pohledy na soubory +Comment[da]=Versionsstyringsplugin til filvisninger Comment[de]=Versionskontroll-Modul für Dateiansichten Comment[el]=Πρόσθετο ελέγχου εκδόσεων για προβολές αρχείων Comment[en_GB]=Version Control Plugin for File Views From 581ee6d0c85bfd18ef39b68ffbea2fb8c8bdf607 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Wed, 18 Nov 2015 00:39:00 +0100 Subject: [PATCH 2/3] GIT_SILENT Upgrade KDE Applications version to 15.11.80. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index afd01117e5..47d069d778 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ project(Dolphin) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "15") -set (KDE_APPLICATIONS_VERSION_MINOR "08") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MINOR "11") +set (KDE_APPLICATIONS_VERSION_MICRO "80") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") From d00b531c74d509a03389485b116cda59162c73ea Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sun, 29 Nov 2015 19:19:33 +0100 Subject: [PATCH 3/3] Call KLocalizedString::setApplicationDomain("dolphin"); dolphin is using -DTRANSLATION_DOMAIN=\"dolphin\" that is wrong for applications, apps need to use KLocalizedString::setApplicationDomain since that makes some other things like the transltators tab in the about dialog show. I have not removed -DTRANSLATION_DOMAIN=\"dolphin\" because on the other hand this code is also a library (i.e. the dolphin kpart). The "being pedandly correct" fix would be using -DTRANSLATION_DOMAIN=\"dolphin\" only to compile the files that are part of the kpart but that's prone to break at some point and using both KLocalizedString::setApplicationDomain and -DTRANSLATION_DOMAIN does not create any problem so i went that route CCMAIL: kfm-devel@kde.org --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 0c5ac87f2f..f51932913c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -48,6 +48,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc")); migrate.migrate(); + KLocalizedString::setApplicationDomain("dolphin"); + KAboutData aboutData("dolphin", i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING), i18nc("@title", "File Manager"), KAboutLicense::GPL,