Commit 9ae1f5a4 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 045222a0
......@@ -14,6 +14,7 @@ Comment[en_GB]=Facebook Protocol
Comment[es]=Protocolo Facebook
Comment[et]=Facebooki protokoll
Comment[fi]=Facebook-yhteyskäytäntö
Comment[fr]=Protocole Facebook
Comment[gl]=Protocolo de Facebook
Comment[it]=Protocollo di Facebook
Comment[ko]=Facebook 프로토콜
......@@ -43,6 +44,7 @@ Name[en_GB]=Facebook
Name[es]=Facebook
Name[et]=Facebook
Name[fi]=Facebook
Name[fr]=Facebook
Name[gl]=Facebook
Name[it]=Facebook
Name[ko]=Facebook
......
......@@ -14,6 +14,7 @@ Comment[en_GB]=Twitter Protocol
Comment[es]=Protocolo Twitter
Comment[et]=Twitteri protokoll
Comment[fi]=Twitter-yhteyskäytäntö
Comment[fr]=Protocole Twitter
Comment[gl]=Protocolo de Twitter
Comment[it]=Protocollo di Twitter
Comment[ko]=트위터 프로토콜
......@@ -43,6 +44,7 @@ Name[en_GB]=Twitter
Name[es]=Twitter
Name[et]=Twitter
Name[fi]=Twitter
Name[fr]=Twitter
Name[gl]=Twitter
Name[it]=Twitter
Name[ko]=트위터
......
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