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-08-02 01:23:06 +00:00
parent e351d9dca1
commit 9eec89b375

View file

@ -4,9 +4,12 @@
"Description": "Provides the bell", "Description": "Provides the bell",
"Description[ca@valencia]": "Proporciona el timbre", "Description[ca@valencia]": "Proporciona el timbre",
"Description[ca]": "Proporciona el timbre", "Description[ca]": "Proporciona el timbre",
"Description[es]": "Proporciona el timbre del sistema",
"Description[he]": "מספק את הפעמון",
"Description[ia]": "Forni le campana", "Description[ia]": "Forni le campana",
"Description[ka]": "მოგაწოდებთ ზარს", "Description[ka]": "მოგაწოდებთ ზარს",
"Description[nl]": "Levert de bel", "Description[nl]": "Levert de bel",
"Description[nn]": "Gjev tilgang til systembjølla",
"Description[sl]": "Zagotavlja zvonec", "Description[sl]": "Zagotavlja zvonec",
"Description[sv]": "Tillhandahåller alarmet", "Description[sv]": "Tillhandahåller alarmet",
"Description[tr]": "Zili çalar", "Description[tr]": "Zili çalar",
@ -17,9 +20,12 @@
"Name": "System Bell", "Name": "System Bell",
"Name[ca@valencia]": "Timbre del sistema", "Name[ca@valencia]": "Timbre del sistema",
"Name[ca]": "Timbre del sistema", "Name[ca]": "Timbre del sistema",
"Name[es]": "Timbre del sistema",
"Name[he]": "פעמון מערכת",
"Name[ia]": "Campana de systema", "Name[ia]": "Campana de systema",
"Name[ka]": "სისტემური ზარი", "Name[ka]": "სისტემური ზარი",
"Name[nl]": "Systeembel", "Name[nl]": "Systeembel",
"Name[nn]": "Systembjølle",
"Name[sl]": "Sistemski zvonec", "Name[sl]": "Sistemski zvonec",
"Name[sv]": "Systemalarm", "Name[sv]": "Systemalarm",
"Name[tr]": "Sistem Zili", "Name[tr]": "Sistem Zili",