Commit 1405e5ca 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 9c3cc079
......@@ -15,6 +15,7 @@ X-KDE-PluginInfo-License=GPL
X-KDE-PluginInfo-EnabledByDefault=false
Name=Fortinet SSLVPN (fortisslvpn)
Name[ca]=Fortinet SSLVPN (fortisslvpn)
Name[es]=SSLVPN de Fortinet (fortisslvpn)
Name[nl]=Fortinet SSLVPN (fortisslvpn)
Name[pt]=SSLVPN do Fortinet (fortisslvpn)
Name[sv]=Fortinet SSLVPN (fortisslvpn)
......@@ -22,6 +23,7 @@ Name[uk]=Fortinet SSLVPN (fortisslvpn)
Name[x-test]=xxFortinet SSLVPN (fortisslvpn)xx
Comment=Fortinet SSLVPN virtual private networks
Comment[ca]=Xarxes privades virtuals Fortinet SSLVPN
Comment[es]=Redes privadas virtuales SSLVPN de Fortinet
Comment[nl]=Fortinet SSLVPN virtuele private netwerken
Comment[pt]=Redes privadas virtuais do SSLVPN do Fortinet
Comment[sv]=Fortinet SSLVPN virtuella privata nätverk
......
......@@ -29,6 +29,7 @@ Name[gl]=VPN baseada en IPsec (openswan)
Name[hu]=IPsec-alapú VPN (openswan)
Name[it]=VPN basata su IPsec (openswan)
Name[ko]=IPSec 기반 VPN(openswan)
Name[lt]=VPN (openswan), IPsec pagrindu
Name[nl]=Op IPsec gebaseerde VPN (openswan)
Name[nn]=IPsec-basert VPN (openswan)
Name[pl]=VPN oparty na IPsec (openswan)
......
......@@ -76,6 +76,7 @@ Comment[he]=תואימות עם שרתי OpenVPN
Comment[hu]=Kompatibilis az OpenVPN kiszolgálóval
Comment[it]=Compatibile con il server OpenVPN
Comment[ko]=OpenVPN 서버와 호환됨
Comment[lt]=Suderinamas su OpenVPN serveriu
Comment[nl]=Compatibel met de OpenVPN-server
Comment[nn]=Kompatibel med OpenVPN-tenaren
Comment[pl]=Zgodny z serwerem OpenVPN
......
......@@ -65,6 +65,7 @@ Comment[he]=תאימות עם שרתי מיקרוסופט המשתמשים ב־P
Comment[hu]=Kompatibilis a Microsoft és más PPTP VPN kiszolgálókkal
Comment[it]=Compatibile con Microsoft e altri server VPN PPTP
Comment[ko]=Microsoft 및 기타 PPTP VPN 서버와 호환됨
Comment[lt]=Suderinamas su Microsoft ir kitais PPTP VPN serveriais
Comment[nl]=Compatibel met Microsoft en andere PPTP VPN servers
Comment[nn]=Kompatibel med Microsoft og andre PPTP VPN-tenarar
Comment[pl]=Zgodny z serwerami VPN Microsoft-u i innymi PPTP
......
......@@ -68,6 +68,7 @@ Comment[he]=תאימות עם שרתי SSL
Comment[hu]=Kompatibilis az SSH kiszolgálókkal
Comment[it]=Compatibile con il server SSH
Comment[ko]=SSH 서버와 호환됨
Comment[lt]=Suderinamas su SSH serveriu
Comment[nl]=Compatibel met de SSH-server
Comment[nn]=Kompatibel med SSH-tenaren
Comment[pl]=Zgodny z serwerem SSH
......
......@@ -65,6 +65,7 @@ Comment[he]=תואם למיקרוסופט ושרתי SSTP VPN אחרים
Comment[hu]=Kompatibilis a Microsoft és más SSTP VPN kiszolgálókkal
Comment[it]=Compatibile con server VPN SSTP di Microsoft e altri
Comment[ko]=Microsoft 및 기타 SSTP VPN 서버와 호환됨
Comment[lt]=Suderinamas su Microsoft ir kitais SSTP VPN serveriais
Comment[nl]=Compatibel met Microsoft en andere SSTP VPN servers
Comment[nn]=Kompatibel med Microsoft og andre SSTP VPN-tenarar
Comment[pl]=Zgodny z serwerami VPN Microsoft-u i innymi SSTP
......
......@@ -30,6 +30,7 @@ Name[he]=‏ VPN מבוסס IPsec‏ (strongswan)
Name[hu]=IPsec-alapú VPN (strongswan)
Name[it]=VPN basata su IPsec (strongswan)
Name[ko]=IPSec 기반 VPN(strongswan)
Name[lt]=IPsec su VPN (strongswan) pagrindu
Name[nl]=Op IPsec gebaseerde VPN (strongswan)
Name[nn]=IPsec-basert VPN (strongswan)
Name[pl]=VPN oparty na IPsec (strongswan)
......
......@@ -30,6 +30,7 @@ Name[he]=Cisco Compatible VPN (vpnc)
Name[hu]=Cisco kompatibilis VPN (vpnc)
Name[it]=VPN compatibile Cisco (vpnc)
Name[ko]=Cisco 호환 VPN(vpnc)
Name[lt]=VPN suderinamas su Cisco (vpnc)
Name[nl]=Cisco Compatible VPN (vpnc)
Name[nn]=Cisco-kompatibel VPN (vpnc)
Name[pl]=Zgodny VPN Cisco (vpnc)
......@@ -64,6 +65,7 @@ Comment[gl]=Compatíbel coas seguintes pasarelas de VPN baseadas en IPsec: Cisco
Comment[hu]=Kompatibilis különböző Cisco, Juniper, Netscreen és Sonicwall IPsec-alapú VPN átjárókkal
Comment[it]=Compatibile con diversi gateway VPN Cisco, Juniper, Netscreen e Sonicwall basati su IPsec
Comment[ko]=Cisco, Juniper, Netscreen, Sonicwall IPSec 기반 VPN 게이트웨이와 호환됨
Comment[lt]=Suderinamas su Cisco, Juniper, Netscreen ir Sonicwall IPsec paremtais VPN tinklų sietuvais
Comment[nl]=Compatibel met verschillende op IPsec gebaseerde VPN-gateways van Cisco, Juniper, Netscreen en Sonicwall
Comment[nn]=Kompatibel med ymse Cisco-, Juniper-, Netscreen- og Sonicwall IPsec-baserte VPN-portnarar
Comment[pl]=Zgodny z różnymi bramami VPN opartymi na Cisco, Juniper, Netscreen, oraz IPsec Sonicwall
......
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