diff options
| author | l10n daemon script <[email protected]> | 2015-12-07 10:14:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-07 10:14:12 +0000 |
| commit | 0fc2c24039bc0cf7ff0f4db4697254fea6947eeb (patch) | |
| tree | 9ba487046c78c781cbc9db8aeb84ddbda1b9e5ad /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | d3c9d3c31f4caa685e4ea7f909f88cb3dc21aafb (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 5ff155c99..d75020e03 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -1,4 +1,5 @@ Name=Dolphin General +Name[ast]=Xeneral de Dolphin Name[ca]=General del Dolphin Name[ca@valencia]=General del Dolphin Name[cs]=Obecný Dolphin @@ -38,6 +39,7 @@ Name[x-test]=xxDolphin Generalxx Name[zh_CN]=Dolphin 常规 Name[zh_TW]=Dolphin 一般 Comment=This service allows configuration of general Dolphin settings. +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. Comment[cs]=Tato služba umožňuje obecné nastavení Dolphinu. @@ -86,6 +88,7 @@ X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-general # ctxt: Random file browsing settings. Name=General +Name[ast]=Xeneral Name[ca]=General Name[ca@valencia]=General Name[cs]=Obecné @@ -124,6 +127,7 @@ Name[x-test]=xxGeneralxx Name[zh_CN]=常规 Name[zh_TW]=一般 Comment=Configure general file manager settings +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ů @@ -160,6 +164,7 @@ Comment[x-test]=xxConfigure general file manager settingsxx Comment[zh_CN]=配置常规文件管理器设置 Comment[zh_TW]=設定一般檔案管理員 X-KDE-Keywords=file manager +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ů |