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/2/head
l10n daemon script
parent 03b469eff5
commit 270e474841

@ -9,6 +9,7 @@ Name[de]=Abstandshalter
Name[el]=Διαχωριστικό
Name[en_GB]=Separator
Name[es]=Separador
Name[eu]=Bereizlea
Name[fi]=Erotin
Name[fr]=Séparateur
Name[gl]=Separador
@ -58,6 +59,7 @@ Keywords[de]=Abstandshalter
Keywords[el]=διαχωριστικό
Keywords[en_GB]=separator
Keywords[es]=separador
Keywords[eu]=bereizlea
Keywords[fi]=erotin
Keywords[gl]=separador
Keywords[it]=separatore

@ -9,6 +9,7 @@ Name[de]=Abstandshalter
Name[el]=Διαχωριστικό
Name[en_GB]=Separator
Name[es]=Separador
Name[eu]=Bereizlea
Name[fi]=Erotin
Name[fr]=Séparateur
Name[gl]=Separador
@ -58,6 +59,7 @@ Keywords[de]=Abstandshalter
Keywords[el]=διαχωριστικό
Keywords[en_GB]=separator
Keywords[es]=separador
Keywords[eu]=bereizlea
Keywords[fi]=erotin
Keywords[gl]=separador
Keywords[it]=separatore

@ -8,6 +8,7 @@ Name[de]=Latte-Plasmoid
Name[el]=Πρόσθετο Latte
Name[en_GB]=Latte Plasmoid
Name[es]=Plasmoide Latte
Name[eu]=Latte plasmoidea
Name[fi]=Latte-sovelma
Name[gl]=Plasmoide de Latte
Name[it]=Plasmoide Latte

@ -8,6 +8,7 @@ Name[de]=Latte-Plasmoid
Name[el]=Πρόσθετο Latte
Name[en_GB]=Latte Plasmoid
Name[es]=Plasmoide Latte
Name[eu]=Latte plasmoidea
Name[fi]=Latte-sovelma
Name[gl]=Plasmoide de Latte
Name[it]=Plasmoide Latte

Loading…
Cancel
Save