Commit 755c2a78 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 dc43948b
Pipeline #88861 skipped
......@@ -116,6 +116,7 @@ X-KDE-Keywords[lt]=tinklai,tinklas,belaidis,belaidžiai,belaidziai,bevielis,bevi
X-KDE-Keywords[nl]=netwerken,wifi,wi-fi,ethernet,mobiel,cdma,gsm,lte,wimax,apn,carrier,2g,3g,4g,5g,5ge,broadband,internet,verkeer,verbindingen,websites,web,DSL,infiniband,bedraad,wireless,bssid,ipv4,ipv6,mac-adres,ip,access point,dns,gateway,wep,leap,wpa,wpa2,wpa3,dhcp,gedeeld netwerk,privé netwerk,publiek netwerk,vpn,openvpn,wireguard,fortinet,juniper,l2tp,pptp,sstp,ssh,iodine,ipsec,anyconnect,openconnect
X-KDE-Keywords[nn]=nettverk,wifi,wi-fi,ethernet,eternett,mobil,cdma,gsm,lte,wimax,apn,carrier,2g,3g,4g,5g,5ge,broadband,breiband,internett,trafikk,tilkoplingar,samband,nettsider,nettstader,web,veven,DSL,infiniband,kabla,trådlaust,wireless,bssid,ipv4,ipv6,mac-adresse,ip,tilgangspunkt,dns,gateway,wep,leap,wpa,wpa2,wpa3,dhcp,delt nettverk,privatnettverk,offentleg nettverk,jobbnettverk,vpn,openvpn,wireguard,fortinet,juniper,l2tp,pptp,sstp,ssh,iodine,ipsec,anyconnect,openconnect
X-KDE-Keywords[pl]=sieci,wifi,wi-fi,ethernet,komórkowe,cdma,gsm,lte,wimax,apn,dostawca,2g,3g,4g,5g,5ge,szerokopasmowe,internet,ruch,połączenia,strony sieciowe,sieć,DSL,infiniband,przewodowe,bezprzewodowe,bssid,ipv4,ipv6,adres mac,ip,punkt dostępowy,dns,brama,wep,leap,wpa,wpa2,wpa3,dhcp,współdzielona siec,prywatna sieć,publiczna sieć,vpn,openvpn,wireguard,fortinet,juniper,l2tp,pptp,sstp,ssh,iodine,ipsec,anyconnect,openconnect
X-KDE-Keywords[pt]=redes,wifi,wi-fi,ethernet,móvel,cdma,gsm,lte,wimax,apn,portadora,2g,3g,4g,5g,5ge,banda larga,internet,tráfego,ligações,páginas Web,web,DSL,infiniband,com fios,sem fios,bssid,ipv4,ipv6,endereço MAC,ip,ponto de acesso,dns,gateway,wep,leap,wpa,wpa2,wpa3,dhcp,rede partilhada,rede privada,rede pública,vpn,openvpn,wireguard,fortinet,juniper,l2tp,pptp,sstp,ssh,iodine,ipsec,anyconnect,openconnect
X-KDE-Keywords[pt_BR]=redes,wifi,wi-fi,ethernet,móvel,cdma,gsm,lte,wimax,apn,portadora,2g,3g,4g,5g,5ge,banda larga,internet,tráfego,conexões,sites,websites,web,DSL,infiniband,com fio,sem fio,wireless,bssid,ipv4,ipv6,endereço mac,ip,ponto de acesso,dns,gateway,wep,leap,wpa,wpa2,wpa3,dhcp,rede compartilhada,rede privada,rede pública,vpn,openvpn,wireguard,fortinet,juniper,l2tp,pptp,sstp,ssh,iodine,ipsec,anyconnect,openconnect
X-KDE-Keywords[ru]=networks,wifi,wi-fi,ethernet,mobile,cdma,gsm,lte,wimax,apn,carrier,2g,3g,4g,5g,5ge,broadband,internet,traffic,connections,websites,web,DSL,infiniband,wired,wireless,bssid,ipv4,ipv6,mac address,ip,access point,dns,gateway,wep,leap,wpa,wpa2,wpa3,dhcp,shared network,private network,public network,vpn,openvpn,wireguard,fortinet,juniper,l2tp,pptp,sstp,ssh,iodine,ipsec,anyconnect,openconnect,сети,интернет,подключения,веб-сайты,веб,проводное,беспроводное,точка доступа,шлюз,общая сеть,частная сеть
X-KDE-Keywords[sk]=siete,wifi,wi-fi,ethernet,mobilné,cdma,gsm,lte,wimax,apn, operátor,2g,3g,4g,5g,5ge,širokopásmové pripojenie,internet,prevádzka,pripojenie,webové stránky,web, DSL,infiniband,káblové,bezdrôtové,bssid,ipv4,ipv6,mac adresa,ip,prístupový bod, dns,brána,wep,leap,wpa,wpa2,wpa3,dhcp,zdieľaná sieť,súkromná sieť, verejná sieť,vpn,openvpn,wireguard,fortinet,juniper,l2tp,pptp,sstp,ssh, iodine,ipsec,anyconnect,openconnect
......
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