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.17
l10n daemon script 7 years ago
parent 300ae679ff
commit 6049c2159a
  1. 1
      colors/BreezeHighContrast.colors
  2. 1
      colors/BreezeLight.colors

@ -109,6 +109,7 @@ Name[ca]=Brisa de contrast alt
Name[ca@valencia]=Brisa de contrast alt
Name[de]=Breeze Hoher Kontrast
Name[es]=Brisa de alto contraste
Name[fi]=Suurikontrastinen Breeze
Name[gl]=Breeze de alto contraste
Name[id]=Breeze High Contrast
Name[it]=Brezza alto contrasto

@ -109,6 +109,7 @@ Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[de]=Breeze Hell
Name[es]=Brisa claro
Name[fi]=Breeze Light
Name[fr]=Brise claire
Name[gl]=Breeze claro
Name[id]=Breeze Light

Loading…
Cancel
Save