Commit 3f14425c 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 5887265a
......@@ -17,6 +17,7 @@ Name=Fortinet SSLVPN (fortisslvpn)
Name[ca]=Fortinet SSLVPN (fortisslvpn)
Name[ca@valencia]=Fortinet SSLVPN (fortisslvpn)
Name[es]=SSLVPN de Fortinet (fortisslvpn)
Name[eu]=Fortinet SSLVPN (fortisslvpn)
Name[fr]=SSLVPN Fortinet (fortisslvpn)
Name[gl]=VPN SSL de Fortinet (fortisslvpn)
Name[it]=Fortinet SSLVPN (fortisslvpn)
......@@ -37,6 +38,7 @@ Comment=Fortinet SSLVPN virtual private networks
Comment[ca]=Xarxes privades virtuals Fortinet SSLVPN
Comment[ca@valencia]=Xarxes privades virtuals Fortinet SSLVPN
Comment[es]=Redes privadas virtuales SSLVPN de Fortinet
Comment[eu]=Fortinet SSLVPN alegiazko sare pribatuak
Comment[fr]=Réseaux privés virtuels SSLVPN Fortinet
Comment[gl]=Redes privadas virtuais SSL de Fortinet
Comment[it]=Reti private virtuali Fortinet SSLVPN
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