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/kcmdolphinnavigation.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/kcmdolphinnavigation.desktop')
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index b969dcb2a..9564c3cfa 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -1,4 +1,5 @@ Name=Dolphin Navigation +Name[ast]=Navegación de Dolphin Name[ca]=Navegació del Dolphin Name[ca@valencia]=Navegació del Dolphin Name[cs]=Navigace Dolphinu @@ -38,6 +39,7 @@ Name[x-test]=xxDolphin Navigationxx Name[zh_CN]=Dolphin 导航 Name[zh_TW]=Dolphin 導覽 Comment=This service allows configuration of the Dolphin navigation. +Comment[ast]=Esti serviciu permite la configuración de la navegación de Dolphin. Comment[ca]=Aquest servei permet la configuració de la navegació del Dolphin. Comment[ca@valencia]=Este servei permet la configuració de la navegació del Dolphin. Comment[cs]=Tato služba umožňuje nastavení navigace v Dolphinu. @@ -85,6 +87,7 @@ X-KDE-PluginKeyword=dolphinnavigation X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-navigation Name=Navigation +Name[ast]=Navegación Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace @@ -124,6 +127,7 @@ Name[x-test]=xxNavigationxx Name[zh_CN]=导航 Name[zh_TW]=導覽 Comment=Configure file manager navigation +Comment[ast]=Configura la navegación del xestor de ficheros Comment[ca]=Configura la navegació del gestor de fitxers Comment[ca@valencia]=Configura la navegació del gestor de fitxers Comment[cs]=Nastavení navigace správce souborů @@ -162,6 +166,7 @@ Comment[x-test]=xxConfigure file manager navigationxx 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ů |