From b54d21e46cbb002e9dabb779fafdd2812e7a25d8 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Dec 2017 04:49:49 +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" --- kdecoration/config/breezedecorationconfig.desktop | 1 + kstyle/config/breezestyleconfig.desktop | 1 + 2 files changed, 2 insertions(+) diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index a9fcb9c2..18301a4e 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -22,6 +22,7 @@ Name[eu]=Breeze leihoen apaindura Name[fr]=Décoration de fenêtre Brise Name[ia]=Decoration de fenestra Breeze Name[it]=Decorazione delle finestre di Brezza +Name[ko]=Breeze 창 장식 Name[nl]=Breeze vensterdecoratie Name[pl]=Wygląd okien Bryzy Name[pt]=Decoração de Janelas Brisa diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index 6205581d..42b661f7 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -22,6 +22,7 @@ Name[eu]=Breeze trepeten estiloa Name[fr]=Style de composant graphique Brise Name[ia]=Stilo de Elemento Graphic de Fenestra (Widget) de Breeze Name[it]=Stile degli oggetti di Brezza +Name[ko]=Breeze 위젯 스타일 Name[nl]=Breeze widgetstijl Name[pl]=Wygląd interfejsu Bryzy Name[pt]=Estilo Gráfico Brisa