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"
This commit is contained in:
l10n daemon script
2024-10-06 01:22:10 +00:00
parent d448cf4c7e
commit 498240c6ec

View File

@@ -263,6 +263,7 @@ Name[ar]=شارك
Name[ca]=Compartició
Name[ca@valencia]=Compartició
Name[cs]=Sdílet
Name[de]=Teilen
Name[el]=Κοινοποίηση
Name[en_GB]=Share
Name[eo]=Kundividi
@@ -292,6 +293,7 @@ Comment=The result of sharing a piece of content
Comment[ar]=نتيجة مشاركة محتوى
Comment[ca]=El resultat de compartir una peça de contingut
Comment[ca@valencia]=El resultat de compartir una peça de contingut
Comment[de]=Das Ergebnis nach dem Teilen eines Teils des Inhalts
Comment[el]=Το αποτέλεσμα του διαμοιρασμού ενός περιεχομένου
Comment[en_GB]=The result of sharing a piece of content
Comment[eo]=La rezulto el kundividado de enhavero