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 · 88ea6f1027
parent 5288ce6cc6
commit 88ea6f1027
6 changed files with 9 additions and 8 deletions
--- a/colors/BreezeDark.colors
+++ b/colors/BreezeDark.colors
@ -117,7 +117,7 @@ Name[en_GB]=Breeze Dark
 Name[es]=Brisa oscuro
 Name[et]=Breeze tume
 Name[eu]=Breeze iluna
-Name[fi]=Breeze Dark
+Name[fi]=Tumma Breeze
 Name[fr]=Brise sombre
 Name[gl]=Breeze Dark
 Name[he]=Breeze Dark
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@ -114,7 +114,7 @@ Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
 Name[et]=Breeze hele
 Name[eu]=Breeze argia
-Name[fi]=Breeze Light
+Name[fi]=Vaalea Breeze
 Name[fr]=Brise clair
 Name[gl]=Breeze claro
 Name[hu]=Breeze Light
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -9,7 +9,7 @@ Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
 Name[et]=Breeze hele
 Name[eu]=Breeze argia
-Name[fi]=Breeze Light
+Name[fi]=Vaalea Breeze
 Name[fr]=Brise clair
 Name[gl]=Breeze claro
 Name[hu]=Breeze Light
@ -43,7 +43,7 @@ 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[fi]=Vaalea Breeze KDE VDG:ltä
 Comment[fr]=Brise Light par KDE VDG
 Comment[gl]=Breeze claro de KDE VDG
 Comment[hu]=Breeze Light a KDE VDG-től
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -9,7 +9,7 @@ Name[en_GB]=Breeze Light
 Name[es]=Brisa claro
 Name[et]=Breeze hele
 Name[eu]=Breeze argia
-Name[fi]=Breeze Light
+Name[fi]=Vaalea Breeze
 Name[fr]=Brise clair
 Name[gl]=Breeze claro
 Name[hu]=Breeze Light
@ -43,7 +43,7 @@ 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[fi]=Vaalea Breeze KDE VDG:ltä
 Comment[fr]=Brise Light par KDE VDG
 Comment[gl]=Breeze claro de KDE VDG
 Comment[hu]=Breeze Light a KDE VDG-től
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -9,7 +9,7 @@ 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[fi]=Tumma Breeze KDE VDG:ltä
 Comment[fr]=Breeze sombre, par KDE VDG
 Comment[gl]=Breeze escuro de KDE VDG
 Comment[hu]=Breeze Dark a KDE VDG-től
@ -46,7 +46,7 @@ Name[en_GB]=Breeze Dark
 Name[es]=Brisa oscuro
 Name[et]=Breeze tume
 Name[eu]=Breeze iluna
-Name[fi]=Breeze Dark
+Name[fi]=Tumma Breeze
 Name[fr]=Brise sombre
 Name[gl]=Breeze Dark
 Name[he]=Breeze Dark
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -6,6 +6,7 @@ Name[en_GB]=Flow
 Name[es]=Fujo
 Name[et]=Flow
 Name[eu]=Flow
+Name[fi]=Flow
 Name[fr]=Flux
 Name[it]=Flusso
 Name[ko]=흐름