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"
pull/29/head
l10n daemon script 1 year ago
parent 71e0243709
commit cb44b6f84d

@ -129,7 +129,7 @@ Name[et]=Importimine nurjus
Name[eu]=Huts egin du inportatzea
Name[fi]=Tuonti epäonnistui
Name[fr]=Échec de l'importation
Name[gl]=Non se puido importar
Name[gl]=Non foi posíbel importar
Name[hsb]=Njemóžach importować
Name[id]=Gagal mengimpor
Name[it]=Impossibile importare
@ -209,7 +209,7 @@ Name[et]=Eksportimine nurjus
Name[eu]=Huts egin du esportatzea
Name[fi]=Vienti epäonnistui
Name[fr]=Exportation impossible
Name[gl]=Non se puido exportar
Name[gl]=Non foi posíbel exportar
Name[hsb]=Njemóžach eksportować
Name[ia]=Falleva a exportar
Name[id]=Gagal mengekspor
@ -290,7 +290,7 @@ Name[et]=Eemaldamine nurjus
Name[eu]=Huts egin du ezabatzea
Name[fi]=Poistaminen epäonnistui
Name[fr]=Échec de la suppression
Name[gl]=Non se puido retirar
Name[gl]=Non foi posíbel retirar
Name[hsb]=Njemóžach wumazać
Name[ia]=Il falleva a remover
Name[id]=Gagal menghapus

Loading…
Cancel
Save