Commit b5b2ba0a 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 ee1bbcce
......@@ -20,6 +20,7 @@ Name[es]=SSLVPN de Fortinet (fortisslvpn)
Name[fr]=SSLVPN Fortinet (fortisslvpn)
Name[it]=Fortinet SSLVPN (fortisslvpn)
Name[nl]=Fortinet SSLVPN (fortisslvpn)
Name[pl]=Fortinet SSLVPN (fortisslvpn)
Name[pt]=SSLVPN do Fortinet (fortisslvpn)
Name[sk]=Fortinet SSLVPN (fortisslvpn)
Name[sr]=Фортинетов ССЛ ВПН
......@@ -38,6 +39,7 @@ Comment[es]=Redes privadas virtuales SSLVPN de Fortinet
Comment[fr]=Réseaux privés virtuels SSLVPN Fortinet
Comment[it]=Reti private virtuali Fortinet SSLVPN
Comment[nl]=Fortinet SSLVPN virtuele private netwerken
Comment[pl]=Fortinet SSLVPN wirtualne prywatne sieci
Comment[pt]=Redes privadas virtuais do SSLVPN do Fortinet
Comment[sk]=Virtuálne privátne siete Fortinet SSLVPN
Comment[sr]=Виртуелне приватне мреже преко Фортинетовог ССЛ ВПН‑а
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