Commit 3da06854 authored by Script Kiddy's avatar Script Kiddy

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 90de5cc6
......@@ -13,6 +13,7 @@ Comment[da]=Facebook-protokol
Comment[de]=Facebook-Protokoll
Comment[en_GB]=Facebook Protocol
Comment[es]=Protocolo Facebook
Comment[et]=Facebooki protokoll
Comment[fi]=Facebook-yhteyskäytäntö
Comment[gl]=Protocolo de Facebook
Comment[it]=Protocollo di Facebook
......@@ -41,6 +42,7 @@ Name[da]=Facebook
Name[de]=Facebook
Name[en_GB]=Facebook
Name[es]=Facebook
Name[et]=Facebook
Name[fi]=Facebook
Name[gl]=Facebook
Name[it]=Facebook
......
......@@ -13,6 +13,7 @@ Comment[da]=Twitter-protokollen
Comment[de]=Twitter-Protokoll
Comment[en_GB]=Twitter Protocol
Comment[es]=Protocolo Twitter
Comment[et]=Twitteri protokoll
Comment[fi]=Twitter-yhteyskäytäntö
Comment[gl]=Protocolo de Twitter
Comment[it]=Protocollo di Twitter
......@@ -41,6 +42,7 @@ Name[da]=Twitter
Name[de]=Twitter
Name[en_GB]=Twitter
Name[es]=Twitter
Name[et]=Twitter
Name[fi]=Twitter
Name[gl]=Twitter
Name[it]=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