Commit 75e446ea 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 ed6129c0
...@@ -7,6 +7,7 @@ X-KDE-InstantMessagingKABCField=messaging/facebook ...@@ -7,6 +7,7 @@ X-KDE-InstantMessagingKABCField=messaging/facebook
Comment=Facebook Protocol Comment=Facebook Protocol
Comment[ast]=Protocolu Facebook Comment[ast]=Protocolu Facebook
Comment[ca]=Protocol Facebook Comment[ca]=Protocol Facebook
Comment[ca@valencia]=Protocol Facebook
Comment[cs]=Protokol Facebook Comment[cs]=Protokol Facebook
Comment[de]=Facebook-Protokoll Comment[de]=Facebook-Protokoll
Comment[en_GB]=Facebook Protocol Comment[en_GB]=Facebook Protocol
...@@ -34,6 +35,7 @@ Comment[zh_CN]=Facebook 协议 ...@@ -34,6 +35,7 @@ Comment[zh_CN]=Facebook 协议
Name=Facebook Name=Facebook
Name[ast]=Facebook Name[ast]=Facebook
Name[ca]=Facebook Name[ca]=Facebook
Name[ca@valencia]=Facebook
Name[de]=Facebook Name[de]=Facebook
Name[en_GB]=Facebook Name[en_GB]=Facebook
Name[es]=Facebook Name[es]=Facebook
......
...@@ -7,6 +7,7 @@ X-KDE-InstantMessagingKABCField=messaging/twitter ...@@ -7,6 +7,7 @@ X-KDE-InstantMessagingKABCField=messaging/twitter
Comment=Twitter Protocol Comment=Twitter Protocol
Comment[ast]=Protocolu Twitter Comment[ast]=Protocolu Twitter
Comment[ca]=Protocol Twitter Comment[ca]=Protocol Twitter
Comment[ca@valencia]=Protocol Twitter
Comment[cs]=Protokol Twitter Comment[cs]=Protokol Twitter
Comment[de]=Twitter-Protokoll Comment[de]=Twitter-Protokoll
Comment[en_GB]=Twitter Protocol Comment[en_GB]=Twitter Protocol
...@@ -34,6 +35,7 @@ Comment[zh_CN]=Twitter 协议 ...@@ -34,6 +35,7 @@ Comment[zh_CN]=Twitter 协议
Name=Twitter Name=Twitter
Name[ast]=Twitter Name[ast]=Twitter
Name[ca]=Twitter Name[ca]=Twitter
Name[ca@valencia]=Twitter
Name[de]=Twitter Name[de]=Twitter
Name[en_GB]=Twitter Name[en_GB]=Twitter
Name[es]=Twitter Name[es]=Twitter
......
Markdown is supported
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