Commit 1fd29822 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 a754d195
......@@ -26,6 +26,7 @@ Name[nl]=Fortinet SSLVPN (fortisslvpn)
Name[pa]=ਫੋਰਟੀਨੈੱਟ SSLVPN (fortisslvpn)
Name[pl]=Fortinet SSLVPN (fortisslvpn)
Name[pt]=SSLVPN do Fortinet (fortisslvpn)
Name[pt_BR]=Fortinet SSLVPN (fortisslvpn)
Name[sk]=Fortinet SSLVPN (fortisslvpn)
Name[sr]=Фортинетов ССЛ ВПН
Name[sr@ijekavian]=Фортинетов ССЛ ВПН
......@@ -49,6 +50,7 @@ Comment[nl]=Fortinet SSLVPN virtuele private netwerken
Comment[pa]=ਫੋਰਟੀਨੈੱਟ SSLVPN ਵਰਚੁਅਲ ਪਰਾਈਵੇਟ ਨੈੱਟਵਰਕ
Comment[pl]=Fortinet SSLVPN wirtualne prywatne sieci
Comment[pt]=Redes privadas virtuais do SSLVPN do Fortinet
Comment[pt_BR]=Redes privadas virtuais Fortinet SSLVPN
Comment[sk]=Virtuálne privátne siete Fortinet SSLVPN
Comment[sr]=Виртуелне приватне мреже преко Фортинетовог ССЛ ВПН‑а
Comment[sr@ijekavian]=Виртуелне приватне мреже преко Фортинетовог ССЛ ВПН‑а
......
......@@ -33,6 +33,7 @@ Name[nn]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[pa]=ਜੂਨੀਪਰ SSL VPN / ਪਲਸ ਕਨੈਕਸ਼ਨ ਸਕਿਉਰ (openconnect)
Name[pl]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[pt]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[pt_BR]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[ru]=Juniper SSL VPN или Pulse Connect Secure (openconnect)
Name[sk]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[sl]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
......@@ -65,6 +66,7 @@ Comment[nn]=Kompatibel med Juniper SSL VPN og Pulse Connect Secure
Comment[pa]=ਜੂਨੀਪਰ SSL VPN ਅਤੇ ਪਲਸ ਕਨੈਕਟ ਸਕਿਉਰ ਨਾਲ ਅਨੁਕੂਲ
Comment[pl]=Zgodny z Juniper SSL VPN oraz Pulse Connect Secure
Comment[pt]=Compatível com o Juniper SSL VPN and Pulse Connect Secure
Comment[pt_BR]=Compatível com Juniper SSL VPN e Pulse Connect Secure
Comment[ru]=Совместимая с Juniper SSL VPN и Pulse Connect Secure
Comment[sk]=Kompatibilné s Juniper SSL VPN a Pulse Connect Secure
Comment[sl]=Združljivo z Juniper SSL VPN in Pulse Connect Secure
......
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