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"
8 years ago · 5043a7675d
parent ad2466f2fa
commit 5043a7675d
5 changed files with 5 additions and 0 deletions
--- a/linux/applications/org.kde.falkon.desktop
+++ b/linux/applications/org.kde.falkon.desktop
@ -11,6 +11,7 @@ Name[en_GB]=Falkon
 Name[es]=Falkon
 Name[fi]=Falkon
 Name[fr]=Falkon
+Name[gl]=Falkon
 Name[id]=Falkon
 Name[it]=Falkon
 Name[nl]=Falkon
--- a/src/lib/data/breeze-fallback/index.theme
+++ b/src/lib/data/breeze-fallback/index.theme
@ -11,6 +11,7 @@ Name[en_GB]=Breeze
 Name[es]=Brisa
 Name[fi]=Breeze
 Name[fr]=Breeze
+Name[gl]=Breeze
 Name[id]=Breeze
 Name[it]=Brezza
 Name[nl]=Breeze
--- a/src/plugins/PIM/metadata.desktop
+++ b/src/plugins/PIM/metadata.desktop
@ -9,6 +9,7 @@ Name[en_GB]=PIM
 Name[es]=PIM
 Name[fi]=Henkilökohtainen ajanhallinta
 Name[fr]=PIM
+Name[gl]=PIM
 Name[id]=PIM
 Name[it]=PIM
 Name[nl]=PIM
--- a/themes/linux/metadata.desktop
+++ b/themes/linux/metadata.desktop
@ -8,6 +8,7 @@ Name[de]=Linux
 Name[en_GB]=Linux
 Name[es]=Linux
 Name[fi]=Linux
+Name[gl]=Linux
 Name[id]=Linux
 Name[it]=Linux
 Name[nl]=Linux
--- a/themes/windows/metadata.desktop
+++ b/themes/windows/metadata.desktop
@ -8,6 +8,7 @@ Name[de]=Windows
 Name[en_GB]=Windows
 Name[es]=Windows
 Name[fi]=Windows
+Name[gl]=Xanelas
 Name[id]=Windows
 Name[it]=Windows
 Name[nl]=Windows