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:
@@ -17,6 +17,7 @@
|
|||||||
"Name[lv]": "Tobias Fella",
|
"Name[lv]": "Tobias Fella",
|
||||||
"Name[nl]": "Tobias Fella",
|
"Name[nl]": "Tobias Fella",
|
||||||
"Name[pl]": "Tobias Fella",
|
"Name[pl]": "Tobias Fella",
|
||||||
|
"Name[ru]": "Tobias Fella",
|
||||||
"Name[sl]": "Tobias Fella",
|
"Name[sl]": "Tobias Fella",
|
||||||
"Name[ta]": "டோபியாஸ் ஃபெல்லா",
|
"Name[ta]": "டோபியாஸ் ஃபெல்லா",
|
||||||
"Name[tr]": "Tobias Fella",
|
"Name[tr]": "Tobias Fella",
|
||||||
@@ -40,6 +41,7 @@
|
|||||||
"Description[lv]": "Kopīgot ar „NeoChat“",
|
"Description[lv]": "Kopīgot ar „NeoChat“",
|
||||||
"Description[nl]": "Delen via NeoChat",
|
"Description[nl]": "Delen via NeoChat",
|
||||||
"Description[pl]": "Udostępnij przez NeoChat",
|
"Description[pl]": "Udostępnij przez NeoChat",
|
||||||
|
"Description[ru]": "Опубликовать в NeoChat",
|
||||||
"Description[sl]": "Deli prek NeoChat",
|
"Description[sl]": "Deli prek NeoChat",
|
||||||
"Description[ta]": "நியோச்சாட் மூலம் பகிர்",
|
"Description[ta]": "நியோச்சாட் மூலம் பகிர்",
|
||||||
"Description[tr]": "NeoChat ile Paylaş",
|
"Description[tr]": "NeoChat ile Paylaş",
|
||||||
@@ -64,6 +66,7 @@
|
|||||||
"Name[lv]": "NeoChat",
|
"Name[lv]": "NeoChat",
|
||||||
"Name[nl]": "NeoChat",
|
"Name[nl]": "NeoChat",
|
||||||
"Name[pl]": "NeoChat",
|
"Name[pl]": "NeoChat",
|
||||||
|
"Name[ru]": "NeoChat",
|
||||||
"Name[sl]": "NeoChat",
|
"Name[sl]": "NeoChat",
|
||||||
"Name[ta]": "நியோச்சாட்",
|
"Name[ta]": "நியோச்சாட்",
|
||||||
"Name[tr]": "NeoChat",
|
"Name[tr]": "NeoChat",
|
||||||
|
|||||||
Reference in New Issue
Block a user