diff options
| author | l10n daemon script <[email protected]> | 2017-01-13 05:50:46 +0100 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2017-01-13 05:50:46 +0100 |
| commit | c1eeb0e115b6074e296892c95192cf464c0c83c9 (patch) | |
| tree | 6280f8e1f958649fd59c42fc5ac53915c81136ed /src/settings/kcm/kcmdolphingeneral.desktop | |
| parent | 82c944f63f2994848f870053987388aa537e6fd8 (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 499fe7391..556231e44 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -95,6 +95,7 @@ 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 Name[cs]=Obecné @@ -177,6 +178,7 @@ 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 X-KDE-Keywords[cs]=správce souborů |