mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
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"
This commit is contained in:
parent
fc38215e2b
commit
20bc412317
|
@ -10,6 +10,7 @@ Name[en_GB]=Falkon
|
|||
Name[es]=Falkon
|
||||
Name[fi]=Falkon
|
||||
Name[fr]=Falkon
|
||||
Name[id]=Falkon
|
||||
Name[nl]=Falkon
|
||||
Name[pl]=Falkon
|
||||
Name[pt]=Falkon
|
||||
|
@ -32,6 +33,7 @@ Comment[en_GB]=A fast and secure web browser
|
|||
Comment[es]=Un navegador web rápido y seguro
|
||||
Comment[fi]=Nopea ja turvallinen verkkoselain
|
||||
Comment[fr]=Un navigateur Web rapide et sécurisé
|
||||
Comment[id]=Sebuah penelusur web yang cepat dan aman
|
||||
Comment[nl]=Een snelle en veilige webbrowser
|
||||
Comment[pl]=Szybka i bezpieczna przeglądarka sieciowa
|
||||
Comment[pt]=Um navegador Web rápido e seguro
|
||||
|
@ -50,6 +52,7 @@ GenericName[en_GB]=Web Browser
|
|||
GenericName[es]=Navegador web
|
||||
GenericName[fi]=Verkkoselain
|
||||
GenericName[fr]=Navigateur Web
|
||||
GenericName[id]=Penelusur Web
|
||||
GenericName[nl]=Webbrowser
|
||||
GenericName[pl]=Przeglądarka sieciowa
|
||||
GenericName[pt]=Navegador Web
|
||||
|
@ -76,6 +79,7 @@ Name[en_GB]=Open new tab
|
|||
Name[es]=Abrir nueva pestaña
|
||||
Name[fi]=Avaa uusi välilehti
|
||||
Name[fr]=Ouvrir un nouvel onglet
|
||||
Name[id]=Buka tab baru
|
||||
Name[nl]=Nieuw tabblad openen
|
||||
Name[pl]=Otwórz nową kartę
|
||||
Name[pt]=Abrir uma nova página
|
||||
|
@ -98,6 +102,7 @@ Name[en_GB]=Open new window
|
|||
Name[es]=Abrir nueva ventana
|
||||
Name[fi]=Avaa uusi ikkuna
|
||||
Name[fr]=Ouvrir une nouvelle fenêtre
|
||||
Name[id]=Buka jendela baru
|
||||
Name[nl]=Nieuw venster openen
|
||||
Name[pl]=Otwórz nowe okno
|
||||
Name[pt]=Abrir uma nova janela
|
||||
|
@ -119,6 +124,7 @@ Name[en_GB]=Start private browsing
|
|||
Name[es]=Iniciar navegación privada
|
||||
Name[fi]=Aloita yksityisselaus
|
||||
Name[fr]=Démarrer la navigation privée
|
||||
Name[id]=Mulai penelusuran privasi
|
||||
Name[nl]=Privébrowsing starten
|
||||
Name[pl]=Rozpocznij prywatne przeglądanie
|
||||
Name[pt]=Iniciar a navegação privada
|
||||
|
|
|
@ -10,6 +10,7 @@ Name[en_GB]=Breeze
|
|||
Name[es]=Brisa
|
||||
Name[fi]=Breeze
|
||||
Name[fr]=Breeze
|
||||
Name[id]=Breeze
|
||||
Name[nl]=Breeze
|
||||
Name[pl]=Bryza
|
||||
Name[pt]=Brisa
|
||||
|
@ -29,6 +30,7 @@ Comment[en_GB]=Breeze Team
|
|||
Comment[es]=Equipo de Brisa
|
||||
Comment[fi]=Breeze-työryhmä
|
||||
Comment[fr]=L'équipe de Breeze
|
||||
Comment[id]=Tim Breeze
|
||||
Comment[nl]=Breeze-team
|
||||
Comment[pl]=Zespół Bryzy
|
||||
Comment[pt]=Equipa do Brisa
|
||||
|
|
Loading…
Reference in New Issue
Block a user