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
4bd207e857
commit
a0c6047a41
1 changed files with 1 additions and 0 deletions
|
@ -11,6 +11,7 @@
|
|||
"Description[ca]": "Envia i rep SMS",
|
||||
"Description[nl]": "SMS verzenden en ontvangen",
|
||||
"Description[pt]": "Enviar e receber SMS's",
|
||||
"Description[pt_BR]": "Envia e recebe SMS",
|
||||
"Description[uk]": "Надсилання і отримання SMS",
|
||||
"Description[x-test]": "xxSend and receive SMSxx",
|
||||
"EnabledByDefault": true,
|
||||
|
|
Loading…
Reference in a new issue