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.24
l10n daemon script 4 years ago
parent eccfb75005
commit dbd4af9b41
  1. 1
      colors/BreezeClassic.colors
  2. 1
      wallpapers/Next/metadata.desktop

@ -120,6 +120,7 @@ Name[ia]=Brisa Classic
Name[it]=Brezza classico
Name[nl]=Breeze Classic
Name[pl]=Klasyczna Bryza
Name[pt]=Brisa Clássica
Name[pt_BR]=Breeze Classic
Name[sl]=Sapica klasična
Name[sv]=Breeze klassisk

@ -16,6 +16,7 @@ Name[ia]=Patak
Name[it]=Patak
Name[nl]=Patak
Name[pl]=Patak
Name[pt]=Patak
Name[pt_BR]=Patak
Name[sl]=Patak
Name[sv]=Patak

Loading…
Cancel
Save