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 5e87b7a42a
commit ad077cec09
  1. 1
      colors/BreezeHighContrast.colors
  2. 1
      colors/BreezeLight.colors

@ -110,6 +110,7 @@ Name[ca@valencia]=Brisa de contrast alt
Name[de]=Breeze Hoher Kontrast
Name[es]=Brisa de alto contraste
Name[gl]=Breeze de alto contraste
Name[id]=Breeze High Contrast
Name[it]=Brezza alto contrasto
Name[nl]=Breeze met hoog contrast
Name[pt]=Brisa de Alto Contraste

@ -111,6 +111,7 @@ Name[de]=Breeze Hell
Name[es]=Brisa claro
Name[fr]=Brise claire
Name[gl]=Breeze claro
Name[id]=Breeze Light
Name[it]=Brezza chiaro
Name[nl]=Breeze Light
Name[pt]=Brisa Clara

Loading…
Cancel
Save