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
9f9cbf9070
commit
cb19b72df7
1 changed files with 1 additions and 0 deletions
|
@ -864,6 +864,7 @@ Name[bg]=Текстът е приет
|
|||
Name[ca]=Text rebut
|
||||
Name[ca@valencia]=Text rebut
|
||||
Name[cs]=Text byl přijat
|
||||
Name[de]=Text empfangen
|
||||
Name[en_GB]=Text Received
|
||||
Name[fr]=Texte reçu
|
||||
Name[gl]=Recibiuse texto
|
||||
|
|
Loading…
Reference in a new issue