diff options
| author | l10n daemon script <[email protected]> | 2018-04-30 07:09:04 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-30 07:09:04 +0200 |
| commit | 94ba6a0978fe03bcd51a37cd252b1ff2a9efe090 (patch) | |
| tree | 93e4f79346cd98d66b7cbe05b1c4fed55df0f7ac /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | c270f4713691e6918054b4bb294e1016cedfbdbe (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 84b09c203..e23594b5e 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -9,6 +9,7 @@ Name[el]=Dolphin Πλοήγηση Name[en_GB]=Dolphin Navigation Name[es]=Navegación de Dolphin Name[et]=Dolphini liikumine +Name[eu]=Dolphin nabigatzea Name[fi]=Dolphin – selaus Name[fr]=Navigation avec Dolphin Name[gl]=Navegación de Dolphin @@ -51,6 +52,7 @@ Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφ� Comment[en_GB]=This service allows configuration of the Dolphin navigation. Comment[es]=Este servicio permite configurar la navegación de Dolphin. Comment[et]=See teenus võimaldab seadistada Dolphinis liikumist. +Comment[eu]=Zerbitzu honek Dolphinen nabigatzea konfiguratzeko balio du. Comment[fi]=Tällä palvelulla voi muokata Dolphinin selausasetuksia. Comment[fr]=Ce service permet de configurer la navigation avec Dolphin. Comment[gl]=Este servizo permite configurar a navegación de Dolphin. @@ -104,6 +106,7 @@ Name[el]=Πλοήγηση Name[en_GB]=Navigation Name[es]=Navegación Name[et]=Liikumine +Name[eu]=Nabigatzea Name[fi]=Selaus Name[fr]=Navigation Name[gl]=Navegación @@ -147,6 +150,7 @@ Comment[el]=Διαμόρφωση πλοήγησης του διαχειριστ� Comment[en_GB]=Configure file manager navigation Comment[es]=Configurar la navegación del gestor de archivos Comment[et]=Failihalduris liikumise seadistamine +Comment[eu]=Konfiguratu fitxategi-kudeatzailearen nabigatzea Comment[fi]=Tiedostonhallinnan selausasetukset Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers Comment[gl]=Configurar a navegación do xestor de ficheiros. @@ -190,6 +194,7 @@ X-KDE-Keywords[el]=διαχειριστής αρχείων X-KDE-Keywords[en_GB]=file manager X-KDE-Keywords[es]=gestor de archivos X-KDE-Keywords[et]=failihaldur +X-KDE-Keywords[eu]=Fitxategi-kudeatzailea X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros |