From 9c11835222bf63e707e534425403b0a8173f3593 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 29 Sep 2019 05:20:56 +0200 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/kwineffects/kcm_kwin_effects.desktop | 1 + kcmkwin/kwinoptions/kwinactions.desktop | 1 + kcmkwin/kwinoptions/kwinfocus.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index ade028a697..0f058f4a37 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -63,6 +63,7 @@ Name[zh_CN]=桌面特效 Name[zh_TW]=桌面效果 Comment=Configure compositor settings for desktop effects Comment[ca]=Configura l'arranjament del compositor per als efectes de l'escriptori +Comment[cs]=Nastavení kompozitoru pro efekty pracovní plochy Comment[en_GB]=Configure compositor settings for desktop effects Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio Comment[gl]=Configurar o compositor para os efectos de escritorio diff --git a/kcmkwin/kwinoptions/kwinactions.desktop b/kcmkwin/kwinoptions/kwinactions.desktop index 5aa261bcfa..6992554d0f 100644 --- a/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kcmkwin/kwinoptions/kwinactions.desktop @@ -31,6 +31,7 @@ Name[zh_TW]=視窗動作 Comment=Configure mouse actions for windows and titlebars Comment[ca]=Configura les accions de ratolí per a les finestres i les barres de títol +Comment[cs]=Nastavení činností myši na oknech a pruhu titulku Comment[en_GB]=Configure mouse actions for windows and titlebars Comment[es]=Configurar las acciones del ratón para las ventanas y las barras de títulos Comment[eu]=Konfiguratu saguaren ekintzak leihoekin eta titulu-barrekin diff --git a/kcmkwin/kwinoptions/kwinfocus.desktop b/kcmkwin/kwinoptions/kwinfocus.desktop index 8c35283ab9..761309516b 100644 --- a/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kcmkwin/kwinoptions/kwinfocus.desktop @@ -30,6 +30,7 @@ Name[zh_TW]=視窗焦點行為 Comment=Configure window activation policy Comment[ca]=Configura la política d'activació de les finestres +Comment[cs]=Nastavení pravidel aktivování oken Comment[en_GB]=Configure window activation policy Comment[es]=Configurar la política de activación de ventanas Comment[eu]=Konfiguratu leihoa aktibatzeko gidalerroak