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:
@@ -289,6 +289,7 @@ Name[ta]=பகிர்
|
|||||||
Name[tr]=Paylaş
|
Name[tr]=Paylaş
|
||||||
Name[uk]=Оприлюднення
|
Name[uk]=Оприлюднення
|
||||||
Name[x-test]=xxSharexx
|
Name[x-test]=xxSharexx
|
||||||
|
Name[zh_CN]=分享
|
||||||
Name[zh_TW]=分享
|
Name[zh_TW]=分享
|
||||||
Comment=The result of sharing a piece of content
|
Comment=The result of sharing a piece of content
|
||||||
Comment[ar]=نتيجة مشاركة محتوى
|
Comment[ar]=نتيجة مشاركة محتوى
|
||||||
@@ -320,5 +321,6 @@ Comment[ta]=எதையோ பகிர்ந்ததன் விளைவ
|
|||||||
Comment[tr]=Bir parça içerik paylaşımının sonucu
|
Comment[tr]=Bir parça içerik paylaşımının sonucu
|
||||||
Comment[uk]=Результат оприлюднення даних
|
Comment[uk]=Результат оприлюднення даних
|
||||||
Comment[x-test]=xxThe result of sharing a piece of contentxx
|
Comment[x-test]=xxThe result of sharing a piece of contentxx
|
||||||
|
Comment[zh_CN]=分享一个内容得到的结果
|
||||||
Comment[zh_TW]=分享一份內容之後的結果
|
Comment[zh_TW]=分享一份內容之後的結果
|
||||||
Action=Popup
|
Action=Popup
|
||||||
|
|||||||
Reference in New Issue
Block a user