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 bd034b4dfa
commit af05d4cb3a
  1. 1
      dataengines/devicenotifications/devicenotifications.notifyrc

@ -85,6 +85,7 @@ Name[it]=Stato dei dispositivi
Name[nl]=Apparaatstatus
Name[nn]=Einingsstatus
Name[pt]=Estado do Dispositivo
Name[pt_BR]=Status do dispositivo
Name[ru]=Состояние устройства
Name[sl]=Stanje naprave
Name[sv]=Enhetsstatus

Loading…
Cancel
Save