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
74a605e0cf
commit
a5ff979996
@ -59,7 +59,7 @@ Name[pt]=Notas de exemplo
|
|||||||
Name[pt_BR]=Notas de exemplo
|
Name[pt_BR]=Notas de exemplo
|
||||||
Name[ru]=Пример с заметками
|
Name[ru]=Пример с заметками
|
||||||
Name[sk]=Ukážkové poznámky
|
Name[sk]=Ukážkové poznámky
|
||||||
Name[sl]=Primer opomb
|
Name[sl]=Primeri sporočilc
|
||||||
Name[sr]=Пример белешки
|
Name[sr]=Пример белешки
|
||||||
Name[sr@ijekavian]=Пример белешки
|
Name[sr@ijekavian]=Пример белешки
|
||||||
Name[sr@ijekavianlatin]=Primer beleški
|
Name[sr@ijekavianlatin]=Primer beleški
|
||||||
|
Loading…
Reference in New Issue
Block a user