diff options
| author | l10n daemon script <[email protected]> | 2015-10-26 10:04:54 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-10-26 10:04:54 +0000 |
| commit | 07dae709d9fe68283caa71d13468b3edc4f0e2be (patch) | |
| tree | f317df1201588aa67e72ee524db78360b57691c2 /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | f5fd8e5cfb43deb1ccb0fef76e335afbde088965 (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'src/settings/kcm/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index f2547264c..522fb56dc 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[cs]=Navigace Dolphinu Name[de]=Dolphin-Navigation +Name[el]=Dolphin Πλοήγηση Name[en_GB]=Dolphin Navigation Name[es]=Navegación de Dolphin Name[fi]=Dolphin – selaus @@ -38,6 +39,7 @@ Comment=This service allows configuration of the Dolphin navigation. Comment[ca]=Aquest servei permet la configuració de la navegació del Dolphin. Comment[cs]=Tato služba umožňuje nastavení navigace v Dolphinu. 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. Comment[es]=Este servicio permite configurar la navegación de Dolphin. Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia. @@ -83,6 +85,7 @@ Name=Navigation Name[ca]=Navegació Name[cs]=Navigace Name[de]=Navigation +Name[el]=Πλοήγηση Name[en_GB]=Navigation Name[es]=Navegación Name[fi]=Selaus @@ -119,6 +122,7 @@ Comment=Configure file manager navigation Comment[ca]=Configura la navegació del gestor de fitxers Comment[cs]=Nastavení navigace správce souborů Comment[de]=Einstellungen zur Navigation mit der Dateiverwaltung +Comment[el]=Διαμόρφωση πλοήγησης του διαχειριστή αρχείων Comment[en_GB]=Configure file manager navigation Comment[es]=Configurar la navegación del gestor de archivos Comment[fi]=Tiedostonhallinnan selausasetukset @@ -155,6 +159,7 @@ X-KDE-Keywords=file manager X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[de]=Dateiverwaltung +X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager X-KDE-Keywords[es]=gestor de archivos X-KDE-Keywords[fi]=tiedostonhallinta |