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"
wilder-5.24
l10n daemon script 6 years ago
parent fd23e41df2
commit bd9d49e82b
  1. 3
      wallpapers/Next/metadata.desktop

@ -3,6 +3,7 @@ Name=Shell
Name[az]=Üzlük
Name[ca]=Shell
Name[cs]=Shell
Name[da]=Skal
Name[de]=Flow
Name[el]=Φλοιός
Name[en_GB]=Shell
@ -10,11 +11,13 @@ Name[es]=Shell
Name[eu]=Oskola
Name[fr]=Interpréteur
Name[it]=Shell
Name[ko]=셸
Name[nl]=Shell
Name[nn]=Skal
Name[pt]=Consola
Name[pt_BR]=Concha
Name[ro]=Înveliș
Name[ru]=Ракушка
Name[sk]=Ulita
Name[sl]=Školjka
Name[sv]=Skal

Loading…
Cancel
Save