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 d9b3eff0d0
commit daa12ee4c3
  1. 2
      colors/BreezeHighContrast.colors
  2. 2
      colors/BreezeLight.colors

@ -108,10 +108,12 @@ Name=Breeze High Contrast
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[gl]=Breeze de alto contraste
Name[nl]=Breeze met hoog contrast
Name[pt]=Brisa de Alto Contraste
Name[ru]=Breeze, высококонтрастный вариант
Name[sv]=Breeze hög kontrast
Name[uk]=Висококонтрастна Breeze
Name[x-test]=xxBreeze High Contrastxx
Name[zh_TW]=Breeze 高對比

@ -108,10 +108,12 @@ Name=Breeze Light
Name[ca]=Brisa clara
Name[ca@valencia]=Brisa clara
Name[de]=Breeze Hell
Name[es]=Brisa claro
Name[gl]=Breeze claro
Name[nl]=Breeze Light
Name[pt]=Brisa Clara
Name[ru]=Breeze
Name[sv]=Breeze Light
Name[uk]=Світла Breeze
Name[x-test]=xxBreeze Lightxx
Name[zh_TW]=Breeze Light

Loading…
Cancel
Save