Commit 8ad11780 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 1f8e0dfc
......@@ -16,6 +16,7 @@
"Name[it]": "Motore per Firewalld",
"Name[ko]": "firewalld 백엔드",
"Name[nl]": "Backend voor firewalld",
"Name[pl]": "Silnik dla Firewalld",
"Name[pt]": "Infra-Estrutura do Firewalld",
"Name[pt_BR]": "Infraestrutura para o Firewalld",
"Name[ro]": "Platformă pentru Firewalld",
......
......@@ -17,6 +17,7 @@ Name[it]=Uncomplicated Firewall
Name[ko]=Uncomplicated Firewall
Name[nl]=Niet-gecompliceerde firewall
Name[nn]=Ukomplisert brannmur
Name[pl]=Nieskomplikowana zapora ogniowa
Name[pt]='Firewall' Descomplicada
Name[pt_BR]=Firewall descomplicado
Name[ro]=Uncomplicated Firewall
......@@ -44,6 +45,7 @@ Name[it]=Interroga il firewall
Name[ko]=방화벽 조회
Name[nl]=Firewall afvragen
Name[nn]=Spør brannmur
Name[pl]=Odpytaj zaporę ogniową
Name[pt]=Consultar a 'Firewall'
Name[pt_BR]=Consulta ao firewall
Name[ro]=Interoghează firewall-ul
......@@ -69,6 +71,7 @@ Description[it]=Interroga lo stato del firewall
Description[ko]=방화벽 상태 조회
Description[nl]=Status van firewall afvragen
Description[nn]=Spør om brannmur-status
Description[pl]=Odpytaj zaporę ogniową o jej stan
Description[pt]=Consultar o Estado da 'Firewall'
Description[pt_BR]=Consulta ao status do firewall
Description[ro]=Interoghează starea firewall-ului
......@@ -97,6 +100,7 @@ Name[it]=Visualizza i registri del firewall
Name[ko]=방화벽 로그 표시
Name[nl]=Firewall-logs bekijken
Name[nn]=Vis brannmur-loggar
Name[pl]=Obejrzyj dzienniki zapory ogniowej
Name[pt]=Ver os Registos da 'Firewall'
Name[pt_BR]=Visualizar os registros do firewall
Name[ro]=Vezi jurnale de firewall
......@@ -122,6 +126,7 @@ Description[it]=Visualizza i registri del firewall
Description[ko]=방화벽 로그 표시
Description[nl]=Firewall-logs bekijken
Description[nn]=Vis brannmur-loggar
Description[pl]=Obejrzyj dzienniki zapory ogniowej
Description[pt]=Ver os registos da 'firewall'
Description[pt_BR]=Visualizar os registros do firewall
Description[ro]=Vezi jurnalele firewall-ului
......@@ -150,6 +155,7 @@ Name[it]=Modifica il firewall
Name[ko]=방화벽 수정
Name[nl]=Firewall wijzigen
Name[nn]=Endra brannmur
Name[pl]=Zmień zaporę ogniową
Name[pt]=Modificar a 'Firewall'
Name[pt_BR]=Modificar o firewall
Name[ro]=Modifică firewall
......@@ -175,6 +181,7 @@ Description[it]=Modifica le impostazioni del firewall
Description[ko]=방화벽 설정 수정
Description[nl]=Firewall-instellingen wijzigen
Description[nn]=Endra brannmur-innstillingar
Description[pl]=Zmień ustawienia zapory ogniowej
Description[pt]=Modificar a configuração da 'firewall'
Description[pt_BR]=Modificar as configurações do firewall
Description[ro]=Modifică configurările firewall-ului
......
......@@ -16,6 +16,7 @@
"Name[it]": "Motore per Uncomplicated Firewall",
"Name[ko]": "Uncomplicated Firewall 백엔드",
"Name[nl]": "Backend voor niet-gecompliceerde firewall",
"Name[pl]": "Silnik dla nieskomplikowanej zapory ogniowej",
"Name[pt]": "Infra-Estrutura da 'Firewall' Descomplicada",
"Name[pt_BR]": "Infraestrutura para o firewall descomplicado",
"Name[ro]": "Platformă pentru Uncomplicated Firewall",
......
......@@ -27,6 +27,7 @@ Name[it]=Firewall
Name[ko]=방화벽
Name[nl]=Firewall
Name[nn]=Brannmur
Name[pl]=Zapora ogniowa
Name[pt]='Firewall'
Name[pt_BR]=Firewall
Name[ro]=Firewall
......@@ -51,6 +52,7 @@ Comment[it]=Controlla le tue regole di rete
Comment[ko]=네트워크 규칙 제어
Comment[nl]=Uw netwerkregels besturen
Comment[nn]=Kontroller nettverksreglar
Comment[pl]=Zarządzaj zasadami w swojej sieci
Comment[pt]=Controlar as suas regras da rede
Comment[pt_BR]=Controle suas regras de rede
Comment[ro]=Controlați regulile de rețea
......@@ -75,6 +77,7 @@ X-KDE-Keywords[it]=firewall, rete, sicurezza
X-KDE-Keywords[ko]=firewall, network, security, 방화벽, 네트워크, 보안
X-KDE-Keywords[nl]=firewall, netwerk, beveiliging
X-KDE-Keywords[nn]=brannmur, nettverk, tryggleik
X-KDE-Keywords[pl]=zapora ogniowa, firewall, sieć, bezpieczeństwo, zabezpieczenia
X-KDE-Keywords[pt]=firewall, rede, segurança
X-KDE-Keywords[pt_BR]=firewall, rede, segurança
X-KDE-Keywords[ro]=firewall, rețea, securitate
......
......@@ -15,6 +15,7 @@ Name[it]=Firewall
Name[ko]=방화벽
Name[nl]=Firewall
Name[nn]=Brannmur
Name[pl]=Zapora ogniowa
Name[pt]='Firewall'
Name[pt_BR]=Firewall
Name[ro]=Firewall
......@@ -39,6 +40,7 @@ Comment[it]=Modifica le impostazioni del firewall
Comment[ko]=방화벽 설정 변경
Comment[nl]=Uw firewall-instellingen aanpassen
Comment[nn]=Juster brannmur-innstillingar
Comment[pl]=Dostosuj ustawienia swojej zapory ogniowej
Comment[pt]=Ajustar a configuração da sua 'firewall'
Comment[pt_BR]=Ajuste suas configurações de firewall
Comment[ro]=Ajustați configurările de firewall
......
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