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 7fa17f6bc9
commit 1affa79c81
  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[it]=Brezza alto contrasto
Name[nl]=Breeze met hoog contrast
Name[pt]=Brisa de Alto Contraste
Name[pt_BR]=Breeze Alto Contraste

@ -110,6 +110,7 @@ Name[ca@valencia]=Brisa clara
Name[de]=Breeze Hell
Name[es]=Brisa claro
Name[gl]=Breeze claro
Name[it]=Brezza chiaro
Name[nl]=Breeze Light
Name[pt]=Brisa Clara
Name[pt_BR]=Breeze Claro

Loading…
Cancel
Save