diff options
| author | l10n daemon script <[email protected]> | 2015-11-04 16:55:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-11-04 16:55:32 +0000 |
| commit | bc8f3373fd98121fbe230842bbb104889961e6d7 (patch) | |
| tree | c7e72e274512eace488b9fab23293e009bb6d7cf /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 536d6ec8666ed89ed993aabb2a4982f8ebf5861c (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 182d09fa8..5ff155c99 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -1,5 +1,6 @@ Name=Dolphin General Name[ca]=General del Dolphin +Name[ca@valencia]=General del Dolphin Name[cs]=Obecný Dolphin Name[de]=Dolphin allgemein Name[el]=Dolphin Γενικά @@ -38,6 +39,7 @@ Name[zh_CN]=Dolphin 常规 Name[zh_TW]=Dolphin 一般 Comment=This service allows configuration of general Dolphin settings. 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[de]=Mit diesem Dienst können allgemeine Einstellungen von Dolphin eingerichtet werden. Comment[el]=Η υπηρεσία αυτή επιτρέπει τη διαμόρφωση των γενικών ρυθμίσεων του Dolphin @@ -85,6 +87,7 @@ X-DocPath=dolphin/index.html#preferences-dialog-general # ctxt: Random file browsing settings. Name=General Name[ca]=General +Name[ca@valencia]=General Name[cs]=Obecné Name[de]=Allgemein Name[el]=Γενικά @@ -122,6 +125,7 @@ Name[zh_CN]=常规 Name[zh_TW]=一般 Comment=Configure general file manager settings 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[de]=Allgemeine Einstellungen an der Dateiverwaltung vornehmen Comment[el]=Διαμόρφωση γενικών ρυθμίσεων διαχείρισης αρχείων @@ -157,6 +161,7 @@ Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager 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[de]=Dateiverwaltung X-KDE-Keywords[el]=διαχειριστής αρχείων |