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.22
l10n daemon script 5 years ago
parent 8cb32e2b73
commit 6214e7b950
  1. 2
      dataengines/devicenotifications/devicenotifications.notifyrc

@ -76,11 +76,13 @@ IconName=device-notifier
[Event/safelyRemovable]
Name=Device Status
Name[az]=Qurğuların statusu
Name[ca]=Estat del dispositiu
Name[es]=Estado del dispositivo
Name[nl]=Apparaatstatus
Name[nn]=Einingsstatus
Name[pt]=Estado do Dispositivo
Name[sl]=Stanje naprave
Name[sv]=Enhetsstatus
Name[uk]=Стан пристрою
Name[x-test]=xxDevice Statusxx

Loading…
Cancel
Save