From 54e46dbd9f1075aeb124e5a188c3ec63bb5605b1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 6 Feb 2019 08:36:52 +0100 Subject: [PATCH] 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" --- kcmkwin/kwintabbox/kwintabbox.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwintabbox/kwintabbox.desktop b/kcmkwin/kwintabbox/kwintabbox.desktop index 4af22ac32c..23348753b9 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -108,7 +108,7 @@ Comment[sr@ijekavianlatin]=Kretanje između prozora Comment[sr@latin]=Kretanje između prozora Comment[sv]=Navigering via fönster Comment[tr]=Pencereler Arası Gezinti -Comment[uk]=Навігація ввікнами +Comment[uk]=Навігація вікнами Comment[vi]=Điều hướng qua các cửa sổ Comment[x-test]=xxNavigation Through Windowsxx Comment[zh_CN]=遍历窗口