diff options
| author | l10n daemon script <[email protected]> | 2016-05-29 09:27:44 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-05-29 09:27:44 +0000 |
| commit | 82af09127d219d0111a38618747d651ef74029a6 (patch) | |
| tree | 472ca205e4b37c4f28f9562bf64465c53204cf2f /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 25cc15a5a2097faad3d647c72bd4c2dadac3f7ef (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/kcmdolphingeneral.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 55ce19177..fbe2d9824 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -4,6 +4,7 @@ Name[ast]=Xeneral de Dolphin 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 @@ -45,6 +46,7 @@ Comment[ast]=Esti serviciu permite la configuración de los axustes xenerales de 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. @@ -96,6 +98,7 @@ Name[ast]=Xeneral Name[ca]=General Name[ca@valencia]=General Name[cs]=Obecné +Name[da]=Generelt Name[de]=Allgemein Name[el]=Γενικά Name[en_GB]=General @@ -136,6 +139,7 @@ Comment[ast]=Configura los axustes xenerales del xestor de ficheros 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 @@ -175,6 +179,7 @@ X-KDE-Keywords[ast]=xestor de ficheros 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 |