Commit a73ce1f7 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 361b5aea
......@@ -15,19 +15,29 @@ X-KDE-PluginInfo-License=GPL
Name=Fortinet SSLVPN (fortisslvpn)
Name[ca]=Fortinet SSLVPN (fortisslvpn)
Name[ca@valencia]=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[sr]=Фортинетов ССЛ ВПН
Name[sr@ijekavian]=Фортинетов ССЛ ВПН
Name[sr@ijekavianlatin]=Fortinetov SSL VPN
Name[sr@latin]=Fortinetov SSL VPN
Name[sv]=Fortinet SSLVPN (fortisslvpn)
Name[uk]=Fortinet SSLVPN (fortisslvpn)
Name[x-test]=xxFortinet SSLVPN (fortisslvpn)xx
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[it]=Reti private virtuali Fortinet SSLVPN
Comment[nl]=Fortinet SSLVPN virtuele private netwerken
Comment[pt]=Redes privadas virtuais do SSLVPN do Fortinet
Comment[sr]=Виртуелне приватне мреже преко Фортинетовог ССЛ ВПН‑а
Comment[sr@ijekavian]=Виртуелне приватне мреже преко Фортинетовог ССЛ ВПН‑а
Comment[sr@ijekavianlatin]=Virtuelne privatne mreže preko Fortinetovog SSL VPN‑a
Comment[sr@latin]=Virtuelne privatne mreže preko Fortinetovog SSL VPN‑a
Comment[sv]=Fortinet SSLVPN virtuella privata nätverk
Comment[uk]=Віртуальні приватні мережі SSLVPN Fortinet
Comment[x-test]=xxFortinet SSLVPN virtual private networksxx
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