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.14
l10n daemon script 9 years ago
parent dda29726a0
commit 3f5f9d09f7
  1. 4
      menu/desktop/kf5-utilities-accessibility.directory

@ -24,7 +24,7 @@ Name[en_GB]=Accessibility
Name[eo]=Alirebleco
Name[es]=Accesibilidad
Name[et]=Hõlbustus
Name[eu]=Erabilerraztasuna
Name[eu]=Irisgarritasuna
Name[fa]=دستیابیپذیری
Name[fi]=Esteettömyys
Name[fr]=Accessibilité
@ -117,7 +117,7 @@ Comment[en_GB]=Accessibility
Comment[eo]=Alirebleco
Comment[es]=Accesibilidad
Comment[et]=Hõlbustus
Comment[eu]=Erabilerraztasuna
Comment[eu]=Irisgarritasuna
Comment[fa]=دستیابیپذیری
Comment[fi]=Esteettömyys
Comment[fr]=Accessibilité

Loading…
Cancel
Save