diff options
| author | l10n daemon script <[email protected]> | 2016-01-20 12:38:42 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2016-01-20 12:38:42 +0000 |
| commit | 3b8623b0403a85751a3b48648a541f9534cd3d78 (patch) | |
| tree | a59737f1cd022c05a18772859c3280a737c2e8af /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 7c343f21dd5c156e1a41823ca8984647d85c4ff8 (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 3801aa3d8..55ce19177 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -1,4 +1,5 @@ Name=Dolphin General +Name[ar]=دولفين العامّ Name[ast]=Xeneral de Dolphin Name[ca]=General del Dolphin Name[ca@valencia]=General del Dolphin @@ -39,6 +40,7 @@ Name[x-test]=xxDolphin Generalxx Name[zh_CN]=Dolphin 常规 Name[zh_TW]=Dolphin 一般 Comment=This service allows configuration of general Dolphin settings. +Comment[ar]=تسمح هذه الخدمة بضبط إعدادات دولفين العامّة. Comment[ast]=Esti serviciu permite la configuración de los axustes xenerales de Dolphin. 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. @@ -89,6 +91,7 @@ X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-general # ctxt: Random file browsing settings. Name=General +Name[ar]=عامّ Name[ast]=Xeneral Name[ca]=General Name[ca@valencia]=General @@ -128,6 +131,7 @@ Name[x-test]=xxGeneralxx Name[zh_CN]=常规 Name[zh_TW]=一般 Comment=Configure general file manager settings +Comment[ar]=اضبط إعدادات مدير الملفّات العامّة 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 @@ -166,6 +170,7 @@ Comment[x-test]=xxConfigure general file manager settingsxx Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager +X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات X-KDE-Keywords[ast]=xestor de ficheros X-KDE-Keywords[ca]=gestor de fitxers X-KDE-Keywords[ca@valencia]=gestor de fitxers |