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/Plasma/6.2
l10n daemon script 2 years ago
parent d8e8f952a2
commit 6004ffe228
  1. 2
      src/plugins/outputlocator/metadata.json

@ -72,6 +72,7 @@
"Description[lt]": "Rodyti ekranų pavadinimus",
"Description[nl]": "Schermnamen tonen",
"Description[pl]": "Pokaż nazwy ekranów",
"Description[ru]": "Просмотр названий экранов",
"Description[sl]": "Prikaži imena zaslonov",
"Description[ta]": "திகளியரகள",
"Description[tr]": "Ekran adlarını göster",
@ -101,6 +102,7 @@
"Name[lt]": "Išvedimo vietos nustatymas",
"Name[nl]": "Locatie bepalen van uitvoer",
"Name[pl]": "Namierzanie wyjścia",
"Name[ru]": "Определение устройства вывода",
"Name[sl]": "Lokator izhoda",
"Name[ta]": "தி கணிிி",
"Name[tr]": "Çıktı Bulucusu",

Loading…
Cancel
Save