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-reb-27
l10n daemon script 3 years ago
parent f6545bfc95
commit 0a6c4c5dc1
  1. 2
      wallpapers/Next/metadata.json

@ -15,6 +15,7 @@
"Name[nl]": "ruvkr",
"Name[pl]": "ruvkr",
"Name[pt]": "ruvkr",
"Name[ru]": "ruvkr",
"Name[sl]": "ruvkr",
"Name[tr]": "ruvkr",
"Name[uk]": "ruvkr",
@ -35,6 +36,7 @@
"Name[nl]": "Kay",
"Name[pl]": "Kay",
"Name[pt]": "Kay",
"Name[ru]": "Kay",
"Name[sl]": "Kay",
"Name[tr]": "Kay",
"Name[uk]": "Кей",

Loading…
Cancel
Save