From c1eeb0e115b6074e296892c95192cf464c0c83c9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 13 Jan 2017 05:50:46 +0100 Subject: 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" --- src/settings/kcm/kcmdolphinnavigation.desktop | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphinnavigation.desktop') diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index e03a336de..9280624d6 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -94,6 +94,7 @@ X-KDE-ParentApp=kcontrol X-DocPath=dolphin/index.html#preferences-dialog-navigation Name=Navigation Name[ar]=التّنقّل +Name[ast]=Navegación Name[ca]=Navegació Name[ca@valencia]=Navegació Name[cs]=Navigace @@ -178,6 +179,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ů -- cgit v1.3.1