Commit 70fc20df 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 7dc3b4ad
Pipeline #267212 skipped
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich,Lukáš Tinkl",
"Name[ca]": "Jan Grulich,Lukáš Tinkl",
"Name[cs]": "Jan Grulich,Lukáš Tinkl",
"Name[de]": "Jan Grulich, Lukáš Tinkl",
"Name[en_GB]": "Jan Grulich,Lukáš Tinkl",
"Name[es]": "Jan Grulich,Lukáš Tinkl",
"Name[eu]": "Jan Grulich,Lukáš Tinkl",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Control i estat de la xarxa",
"Description[ca]": "Control i estat de la xarxa",
"Description[cs]": "Stav a ovládání sítě",
"Description[de]": "Netzwerkstatus und -steuerung",
"Description[en_GB]": "Network status and control",
"Description[es]": "Estado y control de redes",
"Description[eu]": "Sareen egoera eta agintea",
......
......@@ -7,6 +7,7 @@
"Description[ca@valencia]": "Edita les connexions de xarxa",
"Description[ca]": "Edita les connexions de xarxa",
"Description[cs]": "Upravit vaše síťová spojení",
"Description[de]": "Bearbeiten Sie Ihre Netzwerkverbindungen",
"Description[en_GB]": "Edit your Network Connections",
"Description[es]": "Editar las conexiones de red",
"Description[eu]": "Editatu zure sareko konexioak",
......
......@@ -7,6 +7,7 @@
"Description[ca@valencia]": "Proporciona secrets al dimoni NetworkManager",
"Description[ca]": "Proporciona secrets al dimoni NetworkManager",
"Description[cs]": "Poskytuje přihlašovací informace pro službu NetworkManageru",
"Description[de]": "Stellt dem NetworkManager-Dienst vertrauliche Daten zur Verfügung",
"Description[en_GB]": "Provides secrets to the NetworkManager daemon",
"Description[es]": "Proporciona contraseñas al demonio de NetworkManager",
"Description[eu]": "«NetworkManager» daimonari sekretuak hornitzen dizkio",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Tobias Fella",
"Name[ca]": "Tobias Fella",
"Name[cs]": "Tobias Fella",
"Name[de]": "Tobias Fella",
"Name[en_GB]": "Tobias Fella",
"Name[es]": "Tobias Fella",
"Name[eu]": "Tobias Fella",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Punts d'accés Wi-Fi",
"Description[ca]": "Punts d'accés Wi-Fi",
"Description[cs]": "Hostpoty Wi-Fi",
"Description[de]": "Wi-Fi-Hotspots",
"Description[en_GB]": "Wi-Fi Hotspots",
"Description[es]": "Puntos de acceso wifi",
"Description[eu]": "Wi-Fi berogunea",
......
......@@ -8,6 +8,7 @@
"Description[ca@valencia]": "Configuració de la xarxa sense fil",
"Description[ca]": "Configuració de la xarxa sense fil",
"Description[cs]": "Nastavení bezdrátové sítě",
"Description[de]": "Einstellungen für drahtloses Netzwerk",
"Description[en_GB]": "Wireless network setting",
"Description[es]": "Preferencias de la red inalámbrica",
"Description[eu]": "Haririk gabeko sare ezarpena",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Xarxes privades virtuals Fortinet SSLVPN",
"Description[ca]": "Xarxes privades virtuals Fortinet SSLVPN",
"Description[cs]": "Fortinet SSLVPN virtual private networks",
"Description[de]": "Virtuelles privates Netzwerk Fortinet-SSLVPN",
"Description[en_GB]": "Fortinet SSLVPN virtual private networks",
"Description[es]": "Redes privadas virtuales SSLVPN de Fortinet",
"Description[eu]": "Fortinet SSLVPN alegiazko sare pribatuak",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Túnel de connexions via DNS",
"Description[ca]": "Túnel de connexions via DNS",
"Description[cs]": "Spojení tunelem přes DNS",
"Description[de]": "Getunnelte Verbindungen via DNS",
"Description[en_GB]": "Tunnel connections via DNS",
"Description[es]": "Conexiones de túnel que usan DNS",
"Description[eu]": "Tunel konexioak DNS bidez",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Compatible amb els servidors VPN del L2TP",
"Description[ca]": "Compatible amb els servidors VPN del L2TP",
"Description[cs]": "Kompatibilní se servery L2TP VPN",
"Description[de]": "Mit L2TP-VPN-Servern kompatibel",
"Description[en_GB]": "Compatible with L2TP VPN servers",
"Description[es]": "Compatible con servidores VPN de L2TP",
"Description[eu]": "L2TP VPN zerbitzariekin bateragarria",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "VPN basada en IKEv1, IKEv2 sobre IPsec",
"Description[ca]": "VPN basada en IKEv1, IKEv2 sobre IPsec",
"Description[cs]": "VPN založena na IPsec, IKEv1, IKEv2",
"Description[de]": "VPN basierend auf IPsec, IKEv1, IKEv2",
"Description[en_GB]": "IPsec, IKEv1, IKEv2 based VPN",
"Description[es]": "VPN basada en IPsec, IKEv1 e IKEv2",
"Description[eu]": "IPsec, IKEv1, IKEv2 oinarridun VPN",
......@@ -83,6 +85,7 @@
"Name[ca@valencia]": "VPN basada en IPsec (libreswan)",
"Name[ca]": "VPN basada en IPsec (libreswan)",
"Name[cs]": "VPN založena na IPsec (libreswan)",
"Name[de]": "VPN basierend auf IPsec (libreswan)",
"Name[en_GB]": "IPsec based VPN (libreswan)",
"Name[es]": "VPN basada en IPsec (libreswan)",
"Name[eu]": "IPsec oinarridun VPN (libreswan)",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Lukáš Tinkl",
"Name[ca]": "Lukáš Tinkl",
"Name[cs]": "Lukáš Tinkl",
"Name[de]": "Lukáš Tinkl",
"Name[en_GB]": "Lukáš Tinkl",
"Name[es]": "Lukáš Tinkl",
"Name[eu]": "Lukáš Tinkl",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "VPN sobre SSL compatible amb AnyConnect de Cisco",
"Description[ca]": "VPN sobre SSL compatible amb AnyConnect de Cisco",
"Description[cs]": "Kompatibilní s Cisco AnyConnect SSL VPN",
"Description[de]": "Mit Cisco-AnyConnect-SSL-VPN kompatibel",
"Description[en_GB]": "Compatible with Cisco AnyConnect SSL VPN",
"Description[es]": "Compatible con VPN SSL de Cisco AnyConnect",
"Description[eu]": "Cisco AnyConnect SSL VPN-rekin bateragarria",
......
......@@ -8,6 +8,7 @@
"Name[bg]": "KDE plasma",
"Name[ca@valencia]": "Plasma de KDE",
"Name[ca]": "Plasma del KDE",
"Name[de]": "KDE Plasma",
"Name[en_GB]": "KDE Plasma",
"Name[es]": "KDE Plasma",
"Name[eu]": "KDE plasma",
......@@ -37,6 +38,7 @@
"Description[bg]": "Съвместим с Array Networks SSL VPN",
"Description[ca@valencia]": "VPN sobre SSL compatible amb xarxes de matriu",
"Description[ca]": "VPN sobre SSL compatible amb Array Networks",
"Description[de]": "Mit Array-Networks-SSL-VPN kompatibel",
"Description[en_GB]": "Compatible with Array Networks SSL VPN",
"Description[es]": "Compatible con VPN SSL de Array Networks",
"Description[eu]": "Array Networks SSL VPN-rekin bateragarria",
......@@ -66,6 +68,7 @@
"Name[bg]": "Array Networks съвместим VPN (openconnect)",
"Name[ca@valencia]": "VPN compatible amb xarxes de matriu (openconnect)",
"Name[ca]": "VPN compatible amb Array Networks (openconnect)",
"Name[de]": "VPN kompatibel mit Array Networks (openconnect)",
"Name[en_GB]": "Array Networks Compatible VPN (openconnect)",
"Name[es]": "VPN compatible con Array Networks (openconnect)",
"Name[eu]": "Array Networks-ekin bateragarria den VPN (openconnect)",
......
......@@ -8,6 +8,7 @@
"Name[bg]": "KDE plasma",
"Name[ca@valencia]": "Plasma de KDE",
"Name[ca]": "Plasma del KDE",
"Name[de]": "KDE Plasma",
"Name[en_GB]": "KDE Plasma",
"Name[es]": "KDE Plasma",
"Name[eu]": "KDE plasma",
......@@ -37,6 +38,7 @@
"Description[bg]": "Съвместим с F5 BIG-IP SSL VPN",
"Description[ca@valencia]": "VPN sobre SSL compatible amb F5 en BIG-IP",
"Description[ca]": "VPN sobre SSL compatible amb F5 BIG-IP",
"Description[de]": "Mit F5-BIG-IP-SSL-VPN kompatibel",
"Description[en_GB]": "Compatible with F5 BIG-IP SSL VPN",
"Description[es]": "Compatible con VPN SSL de F5 BIG-IP",
"Description[eu]": "F5 BIG-IP SSL VPN-rekin bateragarria",
......@@ -66,6 +68,7 @@
"Name[bg]": "F5 BIG-IP съвместим VPN (openconnect)",
"Name[ca@valencia]": "VPN compatible amb F5 en BIG-IP (openconnect)",
"Name[ca]": "VPN compatible amb F5 BIG-IP (openconnect)",
"Name[de]": "VPN kompatibel mit F5 BIG-IP (openconnect)",
"Name[en_GB]": "F5 BIG-IP Compatible VPN (openconnect)",
"Name[es]": "VPN compatible con F5 BIG-IP (openconnect)",
"Name[eu]": "F5 BIG-IP-rekin bateragarria den VPN (openconnect)",
......
......@@ -8,6 +8,7 @@
"Name[bg]": "KDE plasma",
"Name[ca@valencia]": "Plasma de KDE",
"Name[ca]": "Plasma del KDE",
"Name[de]": "KDE Plasma",
"Name[en_GB]": "KDE Plasma",
"Name[es]": "KDE Plasma",
"Name[eu]": "KDE plasma",
......@@ -37,6 +38,7 @@
"Description[bg]": "Съвместим с Fortinet VPN",
"Description[ca@valencia]": "VPN compatible amb Fortinet",
"Description[ca]": "VPN compatible amb Fortinet",
"Description[de]": "Mit Fortinet-VPN kompatibel",
"Description[en_GB]": "Compatible with Fortinet VPN",
"Description[es]": "Compatible con VPN de Fortinet",
"Description[eu]": "Fortinet VPN-rekin bateragarria",
......@@ -66,6 +68,7 @@
"Name[bg]": "Fortinet съвместим VPN (openconnect)",
"Name[ca@valencia]": "VPN compatible amb Fortinet (openconnect)",
"Name[ca]": "VPN compatible amb Fortinet (openconnect)",
"Name[de]": "VPN kompatibel mit Fortinet (openconnect)",
"Name[en_GB]": "Fortinet Compatible VPN (openconnect)",
"Name[es]": "VPN compatible con Fortinet (openconnect)",
"Name[eu]": "Fortinet-ekin bateragarria den VPN (openconnect)",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Compatible amb la PAN VPN SSL de GlobalProtect",
"Description[ca]": "Compatible amb la PAN VPN SSL de GlobalProtect",
"Description[cs]": "Kompatibilní s PAN GlobalProtect SSL VPN",
"Description[de]": "Mit PAN-GlobalProtect-SSL-VPN kompatibel",
"Description[en_GB]": "Compatible with PAN GlobalProtect SSL VPN",
"Description[es]": "Compatible con VPN SSL de PAN GlobalProtect",
"Description[eu]": "PAN GlobalProtect SSL VPN-rekin bateragarria",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Compatible amb la Juniper Network Connect",
"Description[ca]": "Compatible amb la Juniper Network Connect",
"Description[cs]": "Juniper Network Connect",
"Description[de]": "Kompatibel mit Juniper Network Connect",
"Description[en_GB]": "Compatible with Juniper Network Connect",
"Description[es]": "Compatible con Juniper Network Connect",
"Description[eu]": "Juniper Network Connect-ekin bateragarria",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Compatible amb la VPN SSL de Pulse Connect Secure",
"Description[ca]": "Compatible amb la VPN SSL de Pulse Connect Secure",
"Description[cs]": "Kompatibilní s Pulse Connect Secure SSL VPN",
"Description[de]": "Kompatibel mit Pulse Connect Secure SSL VPN",
"Description[en_GB]": "Compatible with Pulse Connect Secure SSL VPN",
"Description[es]": "Compatible con VPN Pulse Connect Secure SSL",
"Description[eu]": "Pulse Connect Secure SSL VPN-rekin bateragarria",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Lukáš Tinkl",
"Name[ca]": "Lukáš Tinkl",
"Name[cs]": "Lukáš Tinkl",
"Name[de]": "Lukáš Tinkl",
"Name[en_GB]": "Lukáš Tinkl",
"Name[es]": "Lukáš Tinkl",
"Name[eu]": "Lukáš Tinkl",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Compatible amb el servidor OpenVPN",
"Description[ca]": "Compatible amb el servidor OpenVPN",
"Description[cs]": "Kompatibilní se serverem OpenVPN",
"Description[de]": "Mit dem OpenVPN-Server kompatibel",
"Description[en_GB]": "Compatible with the OpenVPN server",
"Description[es]": "Compatible con el servidor de OpenVPN",
"Description[eu]": "OpenVPN zerbitzariarekin bateragarria",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Lukáš Tinkl",
"Name[ca]": "Lukáš Tinkl",
"Name[cs]": "Lukáš Tinkl",
"Name[de]": "Lukáš Tinkl",
"Name[en_GB]": "Lukáš Tinkl",
"Name[es]": "Lukáš Tinkl",
"Name[eu]": "Lukáš Tinkl",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Compatible amb Microsoft i altres servidors VPN sobre PPTP",
"Description[ca]": "Compatible amb Microsoft i altres servidors VPN sobre PPTP",
"Description[cs]": "Kompatibilní se servery Microsoft a jinými PPTP VPN",
"Description[de]": "Mit PPTP-VPN-Servern von Microsoft und anderen kompatibel",
"Description[en_GB]": "Compatible with Microsoft and other PPTP VPN servers",
"Description[es]": "Compatible con Microsoft y otros servidores PPTP VPN",
"Description[eu]": "Microsoft eta beste PPTP VPN zerbitzari batzuekin bateragarria",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Compatible amb el servidor SSH",
"Description[ca]": "Compatible amb el servidor SSH",
"Description[cs]": "Kompatibilní se serverem SSH",
"Description[de]": "Mit dem SSH-Server kompatibel",
"Description[en_GB]": "Compatible with the SSH server",
"Description[es]": "Compatible con el servidor SSH",
"Description[eu]": "SSH zerbitzariarekin bateragarria",
......
......@@ -10,6 +10,7 @@
"Name[ca@valencia]": "Jan Grulich",
"Name[ca]": "Jan Grulich",
"Name[cs]": "Jan Grulich",
"Name[de]": "Jan Grulich",
"Name[en_GB]": "Jan Grulich",
"Name[es]": "Jan Grulich",
"Name[eu]": "Jan Grulich",
......@@ -47,6 +48,7 @@
"Description[ca@valencia]": "Compatible amb Microsoft i altres servidors VPN sobre SSTP",
"Description[ca]": "Compatible amb Microsoft i altres servidors VPN sobre SSTP",
"Description[cs]": "Kompatibilní se servery Microsoft a jinými SSTP VPN",
"Description[de]": "Mit SSTP-VPN-Servern von Microsoft und anderen kompatibel",
"Description[en_GB]": "Compatible with Microsoft and other SSTP VPN servers",
"Description[es]": "Compatible con Microsoft y otros servidores SSTP VPN",
"Description[eu]": "Microsoft eta beste SSTP VPN zerbitzari batzuekin bateragarria",
......
Supports Markdown
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