Commit 361b5aea 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 1405e5ca
......@@ -16,6 +16,7 @@ X-KDE-PluginInfo-EnabledByDefault=false
Name=Fortinet SSLVPN (fortisslvpn)
Name[ca]=Fortinet SSLVPN (fortisslvpn)
Name[es]=SSLVPN de Fortinet (fortisslvpn)
Name[it]=Fortinet SSLVPN (fortisslvpn)
Name[nl]=Fortinet SSLVPN (fortisslvpn)
Name[pt]=SSLVPN do Fortinet (fortisslvpn)
Name[sv]=Fortinet SSLVPN (fortisslvpn)
......@@ -24,6 +25,7 @@ Name[x-test]=xxFortinet SSLVPN (fortisslvpn)xx
Comment=Fortinet SSLVPN virtual private networks
Comment[ca]=Xarxes privades virtuals Fortinet SSLVPN
Comment[es]=Redes privadas virtuales SSLVPN de Fortinet
Comment[it]=Reti private virtuali Fortinet SSLVPN
Comment[nl]=Fortinet SSLVPN virtuele private netwerken
Comment[pt]=Redes privadas virtuais do SSLVPN do Fortinet
Comment[sv]=Fortinet SSLVPN virtuella privata nätverk
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