Commit 41339ff3 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 b425446e
......@@ -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