From 98acc7f1932ddc7d5f07e6e5ed05b04c7a6ddd2e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Sep 2020 06:35:50 +0200 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, 1 insertion(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphinnavigation.desktop') diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 18c0b25d6..834176a27 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -199,7 +199,7 @@ Comment[sr@latin]=Podešavanje navigacije u menadžeru fajlova Comment[sv]=Anpassa filhanterarens navigering Comment[tr]=Dosya yöneticisi gezintisini yapılandır Comment[uk]=Налаштувати навігацію у менеджері файлів -Comment[vi]=Cấu hình điều hướng trình quản lí tập tin +Comment[vi]=Cấu hình điều hướng trình quản lí tệp Comment[x-test]=xxConfigure file manager navigationxx Comment[zh_CN]=配置文件管理器导航 Comment[zh_TW]=設定檔案管理員導覽 -- cgit v1.3.1