Commit ee1bbcce 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 c86bb0d5
......@@ -29,6 +29,7 @@ Name[sr@latin]=Fortinetov SSL VPN
Name[sv]=Fortinet SSLVPN (fortisslvpn)
Name[uk]=Fortinet SSLVPN (fortisslvpn)
Name[x-test]=xxFortinet SSLVPN (fortisslvpn)xx
Name[zh_CN]=Fortinet SSLVPN (fortisslvpn)
Name[zh_TW]=Fortinet SSLVPN (fortisslvpn)
Comment=Fortinet SSLVPN virtual private networks
Comment[ca]=Xarxes privades virtuals Fortinet SSLVPN
......@@ -46,5 +47,6 @@ 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
Comment[zh_CN]=Fortinet SSLVPN 虚拟专网
Comment[zh_TW]=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