From 50571b7921abb4ee9f5ebdce6ceb6de8c900e2ea Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 6 Aug 2016 10:02:15 +0000 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 8742b50e2d..5d2e9e73c4 100644 --- a/kcmkwin/kwintabbox/kwintabbox.desktop +++ b/kcmkwin/kwintabbox/kwintabbox.desktop @@ -96,7 +96,7 @@ Comment[nb]=Navigasjon gjennom vinduer Comment[nds]=Finstern dörgahn Comment[nl]=Navigatie door vensters Comment[nn]=Bla gjennom vindauge -Comment[pl]=Przechodzenie pomiędzy oknami +Comment[pl]=Przełączanie pomiędzy oknami Comment[pt]=Navegação pelas Janelas Comment[pt_BR]=Navegação pelas janelas Comment[ru]=Настройка переключателя окон