From 50b948134c8173de16deec119daf93dee8dcc3f7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 28 Dec 2017 04:45:41 +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/kwinoptions/kwinadvanced.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcmkwin/kwinoptions/kwinadvanced.desktop b/kcmkwin/kwinoptions/kwinadvanced.desktop index 728fe77cba..37230c440c 100644 --- a/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -116,7 +116,7 @@ Comment[gl]=Funcionalidades avanzadas da xestión de xanelas Comment[he]=תכונות ניהול חלונות מתקדמים Comment[hu]=Speciális ablakkezelési szolgáltatások Comment[ia]=Characteristicas avantiate de gestion de fenestra -Comment[id]=Fitur Manajemen Jendela Lanjutan +Comment[id]=Fitur Pengelolaan Jendela Lanjutan Comment[it]=Funzionalità avanzate della gestione delle finestre Comment[ja]=高度なウインドウ管理機能 Comment[ko]=고급 창 관리자 기능 설정