Commit 3f531d4d authored by Script Kiddy's avatar Script Kiddy
Browse files

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 84241338
......@@ -18,6 +18,7 @@ Name[ca]=VPN SSL Juniper (openconnect)
Name[en_GB]=Juniper SSL VPN (openconnect)
Name[es]=VPN Juniper SSL (openconnect)
Name[eu]=Juniper SSL VPN (openconnect)
Name[fr]=VPN SSL Juniper (openconnect)
Name[hu]=Juniper SSL VPN (openconnect)
Name[ia]=Juniper SSL VPN (openconnect)
Name[it]=Juniper SSL VPN (openconnect)
......@@ -35,6 +36,7 @@ Comment[ca]=Compatible amb la Juniper Network Connect
Comment[en_GB]=Compatible with Juniper Network Connect
Comment[es]=Compatible con Juniper Network Connect
Comment[eu]=Juniper Network Connect-ekin bateragarria
Comment[fr]=Compatible avec Juniper Network Connect
Comment[hu]=Kompatibilis a Juniper Network Connecttel
Comment[ia]=Compatibile con Juniper Network Connect
Comment[it]=Compatibile con Juniper Network Connect
......
......@@ -18,6 +18,7 @@ Name[ca]=Pulse Connect Secure (openconnect)
Name[en_GB]=Pulse Connect Secure (openconnect)
Name[es]=Pulse Connect Secure (openconnect)
Name[eu]=Pulse Connect Secure (openconnect)
Name[fr]=Pulse Connect Secure (openconnect)
Name[hu]=Pulse Connect Secure (openconnect)
Name[ia]=Pulse Connect Secure (openconnect)
Name[it]=Pulse Connect Secure (openconnect)
......@@ -35,6 +36,7 @@ Comment[ca]=Compatible amb la VPN SSL de Pulse Connect Secure
Comment[en_GB]=Compatible with Pulse Connect Secure SSL VPN
Comment[es]=VPN compatible con Pulse Connect Secure SSL
Comment[eu]=Pulse Connect Secure SSL VPN-rekin bateragarria
Comment[fr]=Compatible avec les VPN Pulse Connect Secure SSL.
Comment[hu]=Kompatibilis a Pulse Connect Sevure SSL VPN-nel
Comment[ia]=Compatibile con Pulse Connect Secure SSL VPN
Comment[it]=Compatibile con Pulse Connect Secure SSL VPN
......
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