From ef471a0a26b4d181ee0f2d63c37f721debcf397e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Sep 2017 04:56:05 +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" --- cursors/Breeze/Breeze/index.theme | 1 + cursors/Breeze/src/index.theme | 1 + cursors/Breeze_Snow/Breeze_Snow/index.theme | 1 + cursors/Breeze_Snow/src/index.theme | 1 + kdecoration/config/breezedecorationconfig.desktop | 2 ++ kstyle/config/breezestyleconfig.desktop | 2 ++ 6 files changed, 8 insertions(+) diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme index 571239c6..a2fa172a 100644 --- a/cursors/Breeze/Breeze/index.theme +++ b/cursors/Breeze/Breeze/index.theme @@ -60,6 +60,7 @@ Comment[fr]=Thème Plasma de curseur Comment[gl]=Tema do cursor de Plasma de KDE Comment[he]=ערכת סמלים של KDE Plasma Comment[hu]=KDE plazma kurzortéma +Comment[ia]=Thema de cursor de Plasma de KDE Comment[it]=Tema di puntatori di KDE Plasma Comment[ko]=KDE Plasma 커서 테마 Comment[lt]=KDE Plasma žymeklių apipavidalinimas diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme index 571239c6..a2fa172a 100644 --- a/cursors/Breeze/src/index.theme +++ b/cursors/Breeze/src/index.theme @@ -60,6 +60,7 @@ Comment[fr]=Thème Plasma de curseur Comment[gl]=Tema do cursor de Plasma de KDE Comment[he]=ערכת סמלים של KDE Plasma Comment[hu]=KDE plazma kurzortéma +Comment[ia]=Thema de cursor de Plasma de KDE Comment[it]=Tema di puntatori di KDE Plasma Comment[ko]=KDE Plasma 커서 테마 Comment[lt]=KDE Plasma žymeklių apipavidalinimas diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index 66a76244..5fb8e611 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -58,6 +58,7 @@ Comment[fr]=Thème Plasma de curseur Comment[gl]=Tema do cursor de Plasma de KDE Comment[he]=ערכת סמלים של KDE Plasma Comment[hu]=KDE plazma kurzortéma +Comment[ia]=Thema de cursor de Plasma de KDE Comment[it]=Tema di puntatori di KDE Plasma Comment[ko]=KDE Plasma 커서 테마 Comment[lt]=KDE Plasma žymeklių apipavidalinimas diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index 66a76244..5fb8e611 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -58,6 +58,7 @@ Comment[fr]=Thème Plasma de curseur Comment[gl]=Tema do cursor de Plasma de KDE Comment[he]=ערכת סמלים של KDE Plasma Comment[hu]=KDE plazma kurzortéma +Comment[ia]=Thema de cursor de Plasma de KDE Comment[it]=Tema di puntatori di KDE Plasma Comment[ko]=KDE Plasma 커서 테마 Comment[lt]=KDE Plasma žymeklių apipavidalinimas diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index 4b0034a1..b0b4b189 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -17,6 +17,7 @@ Name[el]=Διακοσμήσεις παραθύρου Breeze Name[es]=Decoración de ventanas Brisa 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[nl]=Breeze vensterdecoratie Name[pl]=Wygląd okien Bryzy @@ -88,6 +89,7 @@ X-KDE-Keywords[fr]=breeze,décoration X-KDE-Keywords[gl]=breeze,decoración X-KDE-Keywords[he]=breeze,decoration,מסגרת X-KDE-Keywords[hu]=breeze,dekoráció +X-KDE-Keywords[ia]=breeze,decoration X-KDE-Keywords[it]=brezza,decorazione X-KDE-Keywords[ko]=breeze,decoration,장식 X-KDE-Keywords[lt]=breeze,kekoracija diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index 7a80306e..f52e73ac 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -17,6 +17,7 @@ Name[el]=Στιλ γραφικών συστατικών Breeze Name[es]=Estilo de elementos gráficos Brisa 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[nl]=Breeze widgetstijl Name[pl]=Wygląd interfejsu Bryzy @@ -89,6 +90,7 @@ X-KDE-Keywords[fr]=brise,composant graphique, style X-KDE-Keywords[gl]=breeze,trebello,trebello,estilo X-KDE-Keywords[he]=breeze,widget,style,עיצוב,יישומון X-KDE-Keywords[hu]=breeze,elem,stílus +X-KDE-Keywords[ia]=breeze,widget,style X-KDE-Keywords[it]=brezza,oggetto,stile X-KDE-Keywords[ko]=breeze,widget,style,위젯,스타일 X-KDE-Keywords[lt]=breeze,valdiklis,stilius