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/kcmdolphinservices.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/kcmdolphinservices.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 516cd48d7..2c33eefec 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -1,4 +1,5 @@ Name=Dolphin Services +Name[ar]=خدمات دولفين Name[ast]=Servicios de Dolphin Name[ca]=Serveis del Dolphin Name[ca@valencia]=Serveis del Dolphin @@ -49,6 +50,7 @@ X-KDE-PluginKeyword=dolphinservices X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-services Name=Services +Name[ar]=الخدمات Name[ast]=Servicios Name[ca]=Serveis Name[ca@valencia]=Serveis @@ -88,6 +90,7 @@ Name[x-test]=xxServicesxx Name[zh_CN]=服务 Name[zh_TW]=服務 Comment=Configure file manager services +Comment[ar]=اضبط خدمات مدير الملفّات Comment[ast]=Configura los servicios del xestor de ficheros Comment[ca]=Configura els serveis del gestor de fitxers Comment[ca@valencia]=Configura els serveis del gestor de fitxers @@ -126,6 +129,7 @@ Comment[x-test]=xxConfigure file manager servicesxx 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 |