Commit 845f9024 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 3944b0bc
......@@ -59,6 +59,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_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