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
l10n daemon script 4 years ago
parent 494a2ac402
commit 98ad7ade67
  1. 1
      colors/BreezeClassic.colors
  2. 1
      wallpapers/Next/metadata.desktop

@ -110,6 +110,7 @@ Name[az]=Breeze klassik
Name[ca]=Brisa clàssica
Name[ca@valencia]=Brisa clàssica
Name[cs]=Breeze Classic
Name[da]=Breeze Classic
Name[de]=Breeze Klassisch
Name[el]=Breeze κλασικό
Name[en_GB]=Breeze Classic

@ -4,6 +4,7 @@ Name[ar]=موجة العسل
Name[az]=Bal dalğası
Name[ca]=Honeywave
Name[cs]=Vlna medu
Name[da]=Honeywave
Name[es]=Onda de miel
Name[fi]=Hunaja-aalto
Name[fr]=Onde de miel

Loading…
Cancel
Save