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"master
parent
16f43cd941
commit
3018d1f3b8
|
@ -19,6 +19,7 @@ Name[ko]=Keysmith
|
||||||
Name[nl]=Keysmith
|
Name[nl]=Keysmith
|
||||||
Name[pt]=Keysmith
|
Name[pt]=Keysmith
|
||||||
Name[pt_BR]=Keysmith
|
Name[pt_BR]=Keysmith
|
||||||
|
Name[ru]=Keysmith
|
||||||
Name[sk]=Keysmith
|
Name[sk]=Keysmith
|
||||||
Name[sv]=Keysmith
|
Name[sv]=Keysmith
|
||||||
Name[tg]=Keysmith
|
Name[tg]=Keysmith
|
||||||
|
|
Loading…
Reference in New Issue