Commit 9ee17238 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 966780eb
Pipeline #91877 skipped
......@@ -662,6 +662,7 @@ Name[et]=Tuvastati pääsuleht
Name[eu]=Atari gatibua hauteman da
Name[fi]=Verkon kirjautumissivu havaittu
Name[fr]=Portail captif détecté
Name[hsb]=Captive Portal zwěsćił
Name[hu]=Hitelesítési portál észlelve
Name[ia]=Portal Captif detegite
Name[it]=Captive portal rilevato
......@@ -698,6 +699,7 @@ Name[et]=Piiratud ühenduvus
Name[eu]=Konektagarritasun mugatua
Name[fi]=Rajallinen yhteys
Name[fr]=Connectivité limitée
Name[hsb]=Wobmjezowany zwisk
Name[hu]=Korlátozott kapcsolat
Name[ia]=Connectivitate limitate
Name[id]=Konektivitas Terbatas
......@@ -738,6 +740,7 @@ Name[et]=Pääsupunkti loomine nurjus
Name[eu]=Berogunea sortzea huts egin du
Name[fi]=Tukiaseman luominen epäonnistui
Name[fr]=Impossible de créer le point d'accès
Name[hsb]=Njemóžach hotspot wutworić
Name[hu]=Nem sikerült létrehozni a hotspotot
Name[ia]=Il falleva a crear hotspot
Name[it]=Creazione hotspot non riuscita
......
......@@ -27,6 +27,7 @@ Name[eu]=IPsec oinarridun VPN (openswan)
Name[fi]=IPsec-pohjainen VPN (openswan)
Name[fr]=VPN utilisant IPsec (openswan)
Name[gl]=VPN baseada en IPsec (openswan)
Name[hsb]=na IPsec bazowacy VPN (openswan)
Name[hu]=IPsec-alapú VPN (openswan)
Name[ia]=VPN basate sur IPsec (openswan)
Name[id]=VPN berbasis IPsec (openswan)
......
......@@ -30,6 +30,7 @@ Name[fi]=OpenVPN
Name[fr]=OpenVPN
Name[gl]=OpenVPN
Name[he]=OpenVPN
Name[hsb]=OpenVPN
Name[hu]=OpenVPN
Name[ia]=OpenVPN
Name[id]=OpenVPN
......
......@@ -28,6 +28,7 @@ Name[fi]=Point-to-Point-tunnelointiyhteyskäytäntö (PPTP)
Name[fr]=Protocole de tunnel point à point (PPTP)
Name[gl]=Protocolo de canalización punto a punto (PPTP)
Name[he]=Point-to-Point Tunneling Protocol (PPTP)
Name[hsb]=Point-to-Point Tunneling Protocol (PPTP)
Name[hu]=Point-to-Point Tunneling Protocol (PPTP)
Name[ia]=Point-to-Point Tunneling Protocol (PPTP)
Name[id]=Point-to-Point Tunneling Protocol (PPTP)
......
......@@ -28,6 +28,7 @@ Name[fi]=SSH
Name[fr]=SSH
Name[gl]=SSH
Name[he]=SSH
Name[hsb]=SSH
Name[hu]=SSH
Name[ia]=SSH
Name[id]=SSH
......
......@@ -28,6 +28,7 @@ Name[fi]=Secure Socket -tunnelointiyhteyskäytäntö (SSTP)
Name[fr]=Protocole tunnel socket sécurisé (SSTP)
Name[gl]=Protocolo de canalización de sócket seguro (SSTP)
Name[he]=Secure Socket Tunneling Protocol (SSTP)
Name[hsb]=Secure Socket Tunneling Protocol (SSTP)
Name[hu]=Secure Socket Tunneling Protocol (SSTP)
Name[ia]=Secure Socket Tunneling Protocol (SSTP)
Name[id]=Secure Socket Tunneling Protocol (SSTP)
......
......@@ -28,6 +28,7 @@ Name[fi]=IPsec-pohjainen VPN (strongswan)
Name[fr]=VPN utilisant IPsec (strongswan)
Name[gl]=VPN baseada en IPsec (strongswan)
Name[he]= VPN מבוסס IPsec (strongswan)
Name[hsb]=na IPsec bazowacy VPN (strongswan)
Name[hu]=IPsec-alapú VPN (strongswan)
Name[ia]=VPN basate sur IPsec (strongswan)
Name[id]=VPN berbasis IPsec (strongswan)
......
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