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/kcmdolphingeneral.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/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 e9a309289..dcd2ff9f9 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[cs]=Obecný Dolphin Name[de]=Dolphin allgemein +Name[el]=Dolphin Γενικά Name[en_GB]=Dolphin General Name[es]=Preferencias generales de Dolphin Name[fi]=Dolphin – yleiset @@ -38,6 +39,7 @@ Comment=This service allows configuration of general Dolphin settings. Comment[ca]=Aquest servei permet la configuració de l'arranjament general del Dolphin. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. 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. Comment[es]=Este servicio permite configurar las preferencias generales de Dolphin. Comment[fi]=Tällä palvelulla voi muokata Dolphinin yleisasetuksia. @@ -84,6 +86,7 @@ Name=General Name[ca]=General Name[cs]=Obecné Name[de]=Allgemein +Name[el]=Γενικά Name[en_GB]=General Name[es]=General Name[fi]=Yleiset @@ -119,6 +122,7 @@ Comment=Configure general file manager settings Comment[ca]=Configura les opcions generals del gestor de fitxers Comment[cs]=Obecné nastavení správce souborů Comment[de]=Allgemeine Einstellungen an der Dateiverwaltung vornehmen +Comment[el]=Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων Comment[en_GB]=Configure general file manager settings Comment[es]=Configurar las preferencias generales del gestor de archivos Comment[fi]=Tiedostonhallinnan yleisasetukset @@ -153,6 +157,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 |