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 · b0c01f8327
parent 29c747db56
commit b0c01f8327
6 changed files with 8 additions and 1 deletions
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -14,6 +14,7 @@ Name[fi]=Breeze Snow
 Name[fr]=Brise neigeuse
 Name[gl]=Breeze Snow
 Name[hu]=Breeze Snow
+Name[ia]=Brisa Nive (Breeze Snow)
 Name[it]=Brezza gelida
 Name[ko]=Breeze 눈
 Name[lt]=Breeze sniegas
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -14,6 +14,7 @@ Name[fi]=Breeze Snow
 Name[fr]=Brise neigeuse
 Name[gl]=Breeze Snow
 Name[hu]=Breeze Snow
+Name[ia]=Brisa Nive (Breeze Snow)
 Name[it]=Brezza gelida
 Name[ko]=Breeze 눈
 Name[lt]=Breeze sniegas
--- a/kdecoration/breeze.json
+++ b/kdecoration/breeze.json
@ -57,4 +57,4 @@
        "blur": false, 
        "kcmodule": true
    }
-}
+}
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@ -24,6 +24,7 @@ Name[fi]=Ikkunan kehys
 Name[fr]=Décoration de fenêtre
 Name[gl]=Decoración da xanela
 Name[hu]=Ablakdekoráció
+Name[ia]=Decoration de fenestra
 Name[it]=Decorazione delle finestre
 Name[ko]=창 장식
 Name[lt]=Lango dekoracija
@ -62,6 +63,7 @@ Comment[fi]=Muuta ikkunoiden kehysten ulkoasua
 Comment[fr]=Modifier l'apparence des décorations des fenêtres
 Comment[gl]=Modifica a aparencia da decoración da xanela
 Comment[hu]=Az ablakdekorációk megjelenésének módosítása
+Comment[ia]=Modifica le apparentia de decorationes de fenestra
 Comment[it]=Modifica l'aspetto delle decorazioni delle finestre
 Comment[ko]=창 장식의 모습을 수정합니다
 Comment[lt]=Keisti lango dekoracijų išvaizdą
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@ -24,6 +24,7 @@ Name[fi]=Elementtien tyyli
 Name[fr]=Style de composant graphique
 Name[gl]=Estilo do trebello
 Name[hu]=Elemstílus
+Name[ia]=Stilo de Elemento Graphic de Fenestra (Widget)
 Name[it]=Stile degli oggetti
 Name[ko]=위젯 스타일
 Name[lt]=Valdiklių stilius
@ -62,6 +63,7 @@ Comment[fi]=Muuta elementtien ulkoasua
 Comment[fr]=Modifier l'apparence des composants graphiques
 Comment[gl]=Modifica a aparencia dos trebellos
 Comment[hu]=Az elemek megjelenésének módosítása
+Comment[ia]=Modifica le apparentia de widgets
 Comment[it]=Modifica l'aspetto degli oggetti
 Comment[ko]=위젯의 모습을 수정합니다
 Comment[lt]=Keisti valdiklių išvaizdą
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -51,6 +51,7 @@ Name[fi]=Breeze Dark
 Name[fr]=Brise sombre
 Name[gl]=Breeze Dark
 Name[hu]=Breeze Dark
+Name[ia]=Brisa obscure
 Name[it]=Brezza scuro
 Name[ko]=어두운 Breeze
 Name[lt]=Breeze tamsi