Commit 6882d647 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 ff5229da
......@@ -21,6 +21,7 @@ Name[fr]=SSLVPN Fortinet (fortisslvpn)
Name[it]=Fortinet SSLVPN (fortisslvpn)
Name[nl]=Fortinet SSLVPN (fortisslvpn)
Name[pt]=SSLVPN do Fortinet (fortisslvpn)
Name[sk]=Fortinet SSLVPN (fortisslvpn)
Name[sr]=Фортинетов ССЛ ВПН
Name[sr@ijekavian]=Фортинетов ССЛ ВПН
Name[sr@ijekavianlatin]=Fortinetov SSL VPN
......@@ -37,6 +38,7 @@ Comment[fr]=Réseaux privés virtuels SSLVPN 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[sk]=Virtuálne privátne siete Fortinet SSLVPN
Comment[sr]=Виртуелне приватне мреже преко Фортинетовог ССЛ ВПН‑а
Comment[sr@ijekavian]=Виртуелне приватне мреже преко Фортинетовог ССЛ ВПН‑а
Comment[sr@ijekavianlatin]=Virtuelne privatne mreže preko Fortinetovog SSL VPN‑a
......
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