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:
@@ -9,6 +9,8 @@
|
||||
"Name[fr]": "Tobias Fella",
|
||||
"Name[hu]": "Tobias Fella",
|
||||
"Name[ia]": "Tobias Fella",
|
||||
"Name[it]": "Tobias Fella",
|
||||
"Name[ka]": "Tobias Fella",
|
||||
"Name[nl]": "Tobias Fella",
|
||||
"Name[sl]": "Tobias Fella",
|
||||
"Name[tr]": "Tobias Fella",
|
||||
@@ -24,6 +26,8 @@
|
||||
"Description[fr]": "Partager grâce à NeoChat",
|
||||
"Description[hu]": "Megosztás NeoChatben",
|
||||
"Description[ia]": "Comparti via NeoChat",
|
||||
"Description[it]": "Condividi tramite NeoChat",
|
||||
"Description[ka]": "გააზიარეთ NeoChat-ით",
|
||||
"Description[nl]": "Delen via NeoChat",
|
||||
"Description[sl]": "Deli prek NeoChat",
|
||||
"Description[tr]": "NeoChat ile Paylaş",
|
||||
@@ -38,6 +42,8 @@
|
||||
"Name[fr]": "NeoChat",
|
||||
"Name[hu]": "NeoChat",
|
||||
"Name[ia]": "Neochat",
|
||||
"Name[it]": "NeoChat",
|
||||
"Name[ka]": "NeoChat",
|
||||
"Name[nl]": "NeoChat",
|
||||
"Name[sl]": "NeoChat",
|
||||
"Name[tr]": "NeoChat",
|
||||
|
||||
Reference in New Issue
Block a user