diff options
| author | l10n daemon script <[email protected]> | 2015-03-15 09:54:53 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-03-15 09:54:53 +0000 |
| commit | a7484d2ce51a6734a59a7b3f3ad9ef43c54717ee (patch) | |
| tree | 62bdee7282cac2994ff94f208593cf24b44d9d01 /src/settings/kcm/kcmdolphinnavigation.desktop | |
| parent | 068c6e73209dd6e3f14e9ab8ef573a5dbdb71a2d (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 8c4c7dcbd..cfdd0c7b6 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[en_GB]=Dolphin Navigation Name[fi]=Dolphin – selaus Name[fr]=Navigation avec Dolphin Name[gl]=Navegación de Dolphin @@ -24,6 +25,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[en_GB]=This service allows configuration of the Dolphin navigation. 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. @@ -57,6 +59,7 @@ Name=Navigation Name[ca]=Navegació Name[cs]=Navigace Name[de]=Navigation +Name[en_GB]=Navigation Name[fi]=Selaus Name[fr]=Navigation Name[gl]=Navegación @@ -79,6 +82,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[en_GB]=Configure file manager navigation Comment[fi]=Tiedostonhallinnan selausasetukset Comment[fr]=Configuration la navigation avec le gestionnaire de fichiers Comment[gl]=Configurar a navegación do xestor de ficheiros. @@ -101,6 +105,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[en_GB]=file manager X-KDE-Keywords[fi]=tiedostonhallinta X-KDE-Keywords[fr]=gestionnaire de fichiers X-KDE-Keywords[gl]=xestor de ficheiros |