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"
6 years ago · e72f45bc63
parent 621a4a4087
commit e72f45bc63
10 changed files with 13 additions and 2 deletions
--- a/colors/BreezeDark.colors
+++ b/colors/BreezeDark.colors
@ -115,7 +115,7 @@ Name[de]=Breeze-Dunkel
 Name[el]=Σκοτεινό Breeze
 Name[en_GB]=Breeze Dark
 Name[es]=Brisa oscuro
-Name[et]=Breeze Dark
+Name[et]=Breeze tume
 Name[eu]=Breeze iluna
 Name[fi]=Breeze Dark
 Name[fr]=Brise sombre
--- a/colors/BreezeHighContrast.colors
+++ b/colors/BreezeHighContrast.colors
@ -112,6 +112,7 @@ Name[da]=Breeze højkontrast
 Name[de]=Breeze Hoher Kontrast
 Name[en_GB]=Breeze High Contrast
 Name[es]=Brisa de alto contraste
+Name[et]=Breeze suure kontrastiga
 Name[eu]=Breeze kontraste handikoa
 Name[fi]=Suurikontrastinen Breeze
 Name[fr]=Brise contraste élevé
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@ -112,6 +112,7 @@ Name[da]=Breeze Light
 Name[de]=Breeze Hell
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
+Name[et]=Breeze hele
 Name[eu]=Breeze argia
 Name[fi]=Breeze Light
 Name[fr]=Brise clair
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -52,6 +52,7 @@ Comment[da]=Breeze af KDE's visuelle designgruppe
 Comment[de]=Breeze von der KDE VDG
 Comment[en_GB]=Breeze by the KDE VDG
 Comment[es]=Brisa por KDE VDG
+Comment[et]=Breeze KDE VDG-lt
 Comment[eu]=Breeze, KDE VDGk egina
 Comment[fi]=Breeze KDE VDG:ltä
 Comment[fr]=Brise par KDE VDG
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -52,6 +52,7 @@ Comment[da]=Breeze af KDE's visuelle designgruppe
 Comment[de]=Breeze von der KDE VDG
 Comment[en_GB]=Breeze by the KDE VDG
 Comment[es]=Brisa por KDE VDG
+Comment[et]=Breeze KDE VDG-lt
 Comment[eu]=Breeze, KDE VDGk egina
 Comment[fi]=Breeze KDE VDG:ltä
 Comment[fr]=Brise par KDE VDG
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -7,6 +7,7 @@ Name[da]=Breeze Light
 Name[de]=Breeze Hell
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
+Name[et]=Breeze hele
 Name[eu]=Breeze argia
 Name[fi]=Breeze Light
 Name[fr]=Brise clair
@ -36,6 +37,7 @@ Comment[da]=Breeze Light af KDE's visuelle designgruppe
 Comment[de]=Breeze-Hell von der KDE VDG
 Comment[en_GB]=Breeze Light by the KDE VDG
 Comment[es]=Brisa claro por KDE VDG
+Comment[et]=Breeze hele KDE VDG-lt
 Comment[eu]=Breeze argia, KDE VDGk egina
 Comment[fi]=Breeze Light KDE VDG:ltä
 Comment[fr]=Brise Light par KDE VDG
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -7,6 +7,7 @@ Name[da]=Breeze Light
 Name[de]=Breeze Hell
 Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
+Name[et]=Breeze hele
 Name[eu]=Breeze argia
 Name[fi]=Breeze Light
 Name[fr]=Brise clair
@ -36,6 +37,7 @@ Comment[da]=Breeze Light af KDE's visuelle designgruppe
 Comment[de]=Breeze-Hell von der KDE VDG
 Comment[en_GB]=Breeze Light by the KDE VDG
 Comment[es]=Brisa claro por KDE VDG
+Comment[et]=Breeze hele KDE VDG-lt
 Comment[eu]=Breeze argia, KDE VDGk egina
 Comment[fi]=Breeze Light KDE VDG:ltä
 Comment[fr]=Brise Light par KDE VDG
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@ -18,6 +18,7 @@ Name[de]=Breeze-Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου Breeze
 Name[en_GB]=Breeze Window Decoration
 Name[es]=Decoración de ventanas Brisa
+Name[et]=Breeze akna dekoratsioon
 Name[eu]=Breeze leihoen apaindura
 Name[fi]=Breeze-ikkunankehys
 Name[fr]=Décoration de fenêtre Brise
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@ -18,6 +18,7 @@ Name[de]=Breeze-Stil der Bedienelemente
 Name[el]=Στιλ γραφικών συστατικών Breeze
 Name[en_GB]=Breeze Widget Style
 Name[es]=Estilo de elementos gráficos Brisa
+Name[et]=Breeze vidina stiil
 Name[eu]=Breeze trepeten estiloa
 Name[fi]=Breeze-elementtityyli
 Name[fr]=Style de composant graphique Breeze
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -7,6 +7,7 @@ Comment[da]=Breeze Dark af KDE's visuelle designgruppe
 Comment[de]=Breeze-Dunkel von der KDE VDG
 Comment[en_GB]=Breeze Dark by the KDE VDG
 Comment[es]=Brisa oscuro por KDE VDG
+Comment[et]=Breeze tume KDE VDG-lt
 Comment[eu]=Breeze iluna, KDE VDGk egina
 Comment[fi]=Breeze Dark KDE VDG:ltä
 Comment[fr]=Breeze sombre, par KDE VDG
@ -39,7 +40,7 @@ Name[de]=Breeze-Dunkel
 Name[el]=Σκοτεινό Breeze
 Name[en_GB]=Breeze Dark
 Name[es]=Brisa oscuro
-Name[et]=Breeze Dark
+Name[et]=Breeze tume
 Name[eu]=Breeze iluna
 Name[fi]=Breeze Dark
 Name[fr]=Brise sombre