Commit 4272449b authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 1f445bc8
...@@ -33,7 +33,6 @@ Comment[tr]=Facebook Protokolü ...@@ -33,7 +33,6 @@ Comment[tr]=Facebook Protokolü
Comment[uk]=Протокол Facebook Comment[uk]=Протокол Facebook
Comment[x-test]=xxFacebook Protocolxx Comment[x-test]=xxFacebook Protocolxx
Comment[zh_CN]=Facebook 协议 Comment[zh_CN]=Facebook 协议
Comment[zh_TW]=Facebook 協定
Name=Facebook Name=Facebook
Name[ast]=Facebook Name[ast]=Facebook
Name[ca]=Facebook Name[ca]=Facebook
...@@ -63,5 +62,4 @@ Name[tr]=Facebook ...@@ -63,5 +62,4 @@ Name[tr]=Facebook
Name[uk]=Facebook Name[uk]=Facebook
Name[x-test]=xxFacebookxx Name[x-test]=xxFacebookxx
Name[zh_CN]=Facebook Name[zh_CN]=Facebook
Name[zh_TW]=Facebook
...@@ -33,7 +33,6 @@ Comment[tr]=Twitter Protokolü ...@@ -33,7 +33,6 @@ Comment[tr]=Twitter Protokolü
Comment[uk]=Протокол Twitter Comment[uk]=Протокол Twitter
Comment[x-test]=xxTwitter Protocolxx Comment[x-test]=xxTwitter Protocolxx
Comment[zh_CN]=Twitter 协议 Comment[zh_CN]=Twitter 协议
Comment[zh_TW]=Twitter 協定
Name=Twitter Name=Twitter
Name[ast]=Twitter Name[ast]=Twitter
Name[ca]=Twitter Name[ca]=Twitter
...@@ -64,5 +63,4 @@ Name[tr]=Twitter ...@@ -64,5 +63,4 @@ Name[tr]=Twitter
Name[uk]=Twitter Name[uk]=Twitter
Name[x-test]=xxTwitterxx Name[x-test]=xxTwitterxx
Name[zh_CN]=Twitter Name[zh_CN]=Twitter
Name[zh_TW]=Twitter
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment