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:
@@ -27,6 +27,7 @@
|
||||
"Name[nl]": "Tobias Fella",
|
||||
"Name[nn]": "Tobias Fella",
|
||||
"Name[pl]": "Tobias Fella",
|
||||
"Name[pt_BR]": "Tobias Fella",
|
||||
"Name[ru]": "Tobias Fella",
|
||||
"Name[sa]": "टोबियास फेला",
|
||||
"Name[sk]": "Tobias Fella",
|
||||
@@ -65,6 +66,7 @@
|
||||
"Description[nl]": "Delen via NeoChat",
|
||||
"Description[nn]": "Del via NeoChat",
|
||||
"Description[pl]": "Udostępnij przez NeoChat",
|
||||
"Description[pt_BR]": "Compartilhar via NeoChat",
|
||||
"Description[ru]": "Опубликовать в NeoChat",
|
||||
"Description[sa]": "NeoChat मार्गेण साझां कुर्वन्तु",
|
||||
"Description[sl]": "Deli prek NeoChat",
|
||||
@@ -103,6 +105,7 @@
|
||||
"Name[nl]": "NeoChat",
|
||||
"Name[nn]": "NeoChat",
|
||||
"Name[pl]": "NeoChat",
|
||||
"Name[pt_BR]": "NeoChat",
|
||||
"Name[ru]": "NeoChat",
|
||||
"Name[sa]": "नवचैट्",
|
||||
"Name[sk]": "NeoChat",
|
||||
|
||||
Reference in New Issue
Block a user