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
d1707c7b77
commit
bd73ef548b
1 changed files with 2 additions and 0 deletions
|
@ -914,6 +914,7 @@ Name[pt]=Texto Recebido
|
|||
Name[pt_BR]=Texto recebido
|
||||
Name[ro]=Text primit
|
||||
Name[ru]=Текст получен
|
||||
Name[sk]=Správa prijatá
|
||||
Name[sl]=Besedilo prejeto
|
||||
Name[sv]=Text mottagen
|
||||
Name[ta]=குறுஞ்செய்தி வந்துள்ளது
|
||||
|
@ -951,6 +952,7 @@ Comment[pt]=Recebeu algum texto
|
|||
Comment[pt_BR]=Recebido algum texto
|
||||
Comment[ro]=S-a primit ceva text
|
||||
Comment[ru]=Получен некоторый текст
|
||||
Comment[sk]=Nejaká správa prijatá
|
||||
Comment[sl]=Prejeto nekaj besedila
|
||||
Comment[sv]=Tog emot text
|
||||
Comment[ta]=குறுஞ்செய்தி வந்துள்ளது
|
||||
|
|
Loading…
Reference in a new issue