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-09-12 01:20:59 +00:00
parent 2bc790f4cb
commit 928e4ae5ed

View File

@@ -263,6 +263,7 @@ Name[ar]=شارك
Name[ca]=Compartició
Name[ca@valencia]=Compartició
Name[cs]=Sdílet
Name[el]=Κοινοποίηση
Name[en_GB]=Share
Name[eo]=Kundividi
Name[es]=Compartir
@@ -291,6 +292,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[el]=Το αποτέλεσμα του διαμοιρασμού ενός περιεχομένου
Comment[en_GB]=The result of sharing a piece of content
Comment[eo]=La rezulto el kundividado de enhavero
Comment[es]=El resultado de compartir una parte de contenido