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"
4 years ago · f43f38dac0
parent e85efaab47
commit f43f38dac0
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -7,6 +7,7 @@ Name[ca@valencia]=Aterratge segur
 Name[de]=Sichere Landung
 Name[es]=Aterrizaje seguro
 Name[fr]=Atterrissage en douceur
+Name[ia]=Atterrage secur (Safe Landing)
 Name[it]=Atterraggio sicuro
 Name[nl]=Veilige landing
 Name[nn]=Trygg landing