Commit 838e1951 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 066a5437
......@@ -9,6 +9,7 @@ Comment[ast]=Protocolu Facebook
Comment[ca]=Protocol Facebook
Comment[ca@valencia]=Protocol Facebook
Comment[cs]=Protokol Facebook
Comment[da]=Facebook-protokol
Comment[de]=Facebook-Protokoll
Comment[en_GB]=Facebook Protocol
Comment[es]=Protocolo Facebook
......@@ -36,6 +37,7 @@ Name=Facebook
Name[ast]=Facebook
Name[ca]=Facebook
Name[ca@valencia]=Facebook
Name[da]=Facebook
Name[de]=Facebook
Name[en_GB]=Facebook
Name[es]=Facebook
......
......@@ -9,6 +9,7 @@ Comment[ast]=Protocolu Twitter
Comment[ca]=Protocol Twitter
Comment[ca@valencia]=Protocol Twitter
Comment[cs]=Protokol Twitter
Comment[da]=Twitter-protokollen
Comment[de]=Twitter-Protokoll
Comment[en_GB]=Twitter Protocol
Comment[es]=Protocolo Twitter
......@@ -36,6 +37,7 @@ Name=Twitter
Name[ast]=Twitter
Name[ca]=Twitter
Name[ca@valencia]=Twitter
Name[da]=Twitter
Name[de]=Twitter
Name[en_GB]=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