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"
9 years ago · ef471a0a26
parent 4aeebe0f00
commit ef471a0a26
6 changed files with 8 additions and 0 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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