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:
@@ -42,6 +42,7 @@ Comment[en_GB]=Find rooms in NeoChat
|
||||
Comment[es]=Buscar salas en NeoChat
|
||||
Comment[fi]=Etsi huoneita NeoChatissä
|
||||
Comment[fr]=Trouver des salons dans NeoChat
|
||||
Comment[it]=Trova stanze in NeoChat
|
||||
Comment[ko]=NeoChat에서 대화방 찾기
|
||||
Comment[nl]=Rooms zoeken in NeoChat
|
||||
Comment[pt_BR]=Encontrar salas no NeoChat
|
||||
|
||||
Reference in New Issue
Block a user