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:
parent
e351d9dca1
commit
9eec89b375
1 changed files with 6 additions and 0 deletions
|
@ -4,9 +4,12 @@
|
|||
"Description": "Provides the bell",
|
||||
"Description[ca@valencia]": "Proporciona el timbre",
|
||||
"Description[ca]": "Proporciona el timbre",
|
||||
"Description[es]": "Proporciona el timbre del sistema",
|
||||
"Description[he]": "מספק את הפעמון",
|
||||
"Description[ia]": "Forni le campana",
|
||||
"Description[ka]": "მოგაწოდებთ ზარს",
|
||||
"Description[nl]": "Levert de bel",
|
||||
"Description[nn]": "Gjev tilgang til systembjølla",
|
||||
"Description[sl]": "Zagotavlja zvonec",
|
||||
"Description[sv]": "Tillhandahåller alarmet",
|
||||
"Description[tr]": "Zili çalar",
|
||||
|
@ -17,9 +20,12 @@
|
|||
"Name": "System Bell",
|
||||
"Name[ca@valencia]": "Timbre del sistema",
|
||||
"Name[ca]": "Timbre del sistema",
|
||||
"Name[es]": "Timbre del sistema",
|
||||
"Name[he]": "פעמון מערכת",
|
||||
"Name[ia]": "Campana de systema",
|
||||
"Name[ka]": "სისტემური ზარი",
|
||||
"Name[nl]": "Systeembel",
|
||||
"Name[nn]": "Systembjølle",
|
||||
"Name[sl]": "Sistemski zvonec",
|
||||
"Name[sv]": "Systemalarm",
|
||||
"Name[tr]": "Sistem Zili",
|
||||
|
|
Loading…
Reference in a new issue