Commit b813cf7d 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 b5b2ba0a
......@@ -20,6 +20,7 @@ Name[es]=Conexiones
Name[eu]=Konexioak
Name[fi]=Yhteydet
Name[fr]=Connexions
Name[gl]=Conexións
Name[he]=חיבורים
Name[hu]=Kapcsolatok
Name[it]=Connessioni
......@@ -55,6 +56,7 @@ Comment[es]=Editar las conexiones de red
Comment[eu]=Editatu zure sareko konexioak
Comment[fi]=Verkkoyhteyksien muokkaus
Comment[fr]=Modifier vos connexions réseau
Comment[gl]=Edite as súas conexións de rede
Comment[he]=ערוך את חיבורי הרשת שלך
Comment[hu]=A hálózati kapcsolatok szerkesztése
Comment[it]=Modifica le tue connessioni di rete
......@@ -89,6 +91,7 @@ X-KDE-Keywords[es]=red,wifi,ethernet,móvil,banda ancha,vpn,internet,tráfico
X-KDE-Keywords[eu]=sarea,wifi,ethernet,mugikor,banda zabala,vpn,internet,trafikoa
X-KDE-Keywords[fi]=verkko,langaton,ethernet,mobiili,laajakaista,vpn,internet,liikenne
X-KDE-Keywords[fr]=réseau,wifi,ethernet,mobile,large bande,vpn,internet,traffic
X-KDE-Keywords[gl]=network,rede,wifi,ethernet,mobile,móbil,broadband,banda larga,vpn,internet,traffic,tráfico
X-KDE-Keywords[he]=network,wifi,ethernet,mobile,broadband,vpn,internet,traffic,רשת,ויפי,אינטרנט,תעבורה
X-KDE-Keywords[hu]=hálózat,wifi,ethernet,mobil,szélessáv,vpn,internet,forgalom
X-KDE-Keywords[it]=rete,wifi,ethernet,mobile,banda larga,vpn,internet,traffico
......
......@@ -743,6 +743,7 @@ Name[et]=Tuvastati pääsuleht
Name[eu]=Atari gatibua detektatu da
Name[fi]=Verkon kirjautumissivu havaittu
Name[fr]=Portail captif détecté
Name[gl]=Detectouse un portal cativo
Name[hu]=Hitelesítési portál észlelve
Name[it]=Captive portal rilevato
Name[ko]=인증 포털 감지됨
......
......@@ -18,6 +18,7 @@ Name[ca]=Fortinet SSLVPN (fortisslvpn)
Name[ca@valencia]=Fortinet SSLVPN (fortisslvpn)
Name[es]=SSLVPN de Fortinet (fortisslvpn)
Name[fr]=SSLVPN Fortinet (fortisslvpn)
Name[gl]=VPN SSL de Fortinet (fortisslvpn)
Name[it]=Fortinet SSLVPN (fortisslvpn)
Name[nl]=Fortinet SSLVPN (fortisslvpn)
Name[pl]=Fortinet SSLVPN (fortisslvpn)
......@@ -37,6 +38,7 @@ Comment[ca]=Xarxes privades virtuals Fortinet SSLVPN
Comment[ca@valencia]=Xarxes privades virtuals Fortinet SSLVPN
Comment[es]=Redes privadas virtuales SSLVPN de Fortinet
Comment[fr]=Réseaux privés virtuels SSLVPN Fortinet
Comment[gl]=Redes privadas virtuais SSL de Fortinet
Comment[it]=Reti private virtuali Fortinet SSLVPN
Comment[nl]=Fortinet SSLVPN virtuele private netwerken
Comment[pl]=Fortinet SSLVPN wirtualne prywatne sieci
......
......@@ -24,6 +24,7 @@ Name[es]=Túnel DNS Iodine (iodine)
Name[eu]=Iodine DNS-tunela (iodine)
Name[fi]=Iodine-DNS-tunneli (iodine)
Name[fr]=Tunnel DNS Iodine (iodine)
Name[gl]=Túnel DNS de Iodine (iodine)
Name[hu]=Iodine DNS tunnel (iodine)
Name[it]=Tunnel DNS Iodine
Name[ko]=Iodine DNS 터널(iodine)
......@@ -56,6 +57,7 @@ Comment[es]=Conexiones de túnel que usan DNS
Comment[eu]=Tunel konexioak DNS bidez
Comment[fi]=Tunneliyhteydet DNS:n kautta
Comment[fr]=Connexions tunnel via DNS
Comment[gl]=Conexións por túnel mediante DNS
Comment[hu]=Tunnelkapcsolatok DNS-en keresztül
Comment[it]=Incapsula le connessioni tramite DNS
Comment[ko]=DNS로 연결 터널링
......
......@@ -24,6 +24,7 @@ Name[es]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[eu]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[fi]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[fr]=VPN SSL Juniper / Pulse Connect Secure (openconnect)
Name[gl]=VPN SSL de Juniper / Pulse Connect Secure (openconnect)
Name[hu]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[it]=Juniper SSL VPN / Pulse Connect Secure (openconnect)
Name[ko]=Juniper SSL VPN / Pulse Connect Secure(openconnect)
......@@ -54,6 +55,7 @@ Comment[es]=Compatible con Juniper SSL VPN y Pulse Connect Secure
Comment[eu]=Juniper SSL VPN eta Pulse Connect Secure-kin bateragarria
Comment[fi]=Yhteensopiva Juniper SSL VPN:n ja Pulse Connect Securen kanssa
Comment[fr]=Compatible avec les VPN SSL Juniper et Pulse Connect Secure
Comment[gl]=Compatíbel coas VPN SSL de Juniper e con Pulse Connect Secure.
Comment[hu]=Kompatibilis Juniper SSL VPN-nel és Pulse Connect Secure-ral
Comment[it]=Compatibile con Juniper SSL VPN e Pulse Connect Secure
Comment[ko]=Juniper SSL VPN 및 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