mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 02:36:34 +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
a9c8ab7045
commit
7faf9e2e8d
@ -8,6 +8,7 @@ Name[cs]=Falkon
|
||||
Name[de]=Falkon
|
||||
Name[en_GB]=Falkon
|
||||
Name[es]=Falkon
|
||||
Name[fi]=Falkon
|
||||
Name[nl]=Falkon
|
||||
Name[pt]=Falkon
|
||||
Name[sk]=Falkon
|
||||
@ -26,6 +27,7 @@ Comment[cs]=Rychlý a bezpečný webový prohlížeč
|
||||
Comment[de]=Ein schneller und sicherer Webbrowser
|
||||
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[nl]=Een snelle en veilige webbrowser
|
||||
Comment[pt]=Um navegador Web rápido e seguro
|
||||
Comment[sv]=En snabb och säker webbläsare
|
||||
@ -41,6 +43,7 @@ GenericName[cs]=Webový prohlížeč
|
||||
GenericName[de]=Webbrowser
|
||||
GenericName[en_GB]=Web Browser
|
||||
GenericName[es]=Navegador web
|
||||
GenericName[fi]=Verkkoselain
|
||||
GenericName[fr]=Navigateur Web
|
||||
GenericName[nl]=Webbrowser
|
||||
GenericName[pt]=Navegador Web
|
||||
@ -65,6 +68,7 @@ Name[cs]=Otevřít novou kartu
|
||||
Name[de]=Neues Unterfenster öffnen
|
||||
Name[en_GB]=Open new tab
|
||||
Name[es]=Abrir nueva pestaña
|
||||
Name[fi]=Avaa uusi välilehti
|
||||
Name[nl]=Nieuw tabblad openen
|
||||
Name[pt]=Abrir uma nova página
|
||||
Name[sk]=Otvoriť novú záložku
|
||||
@ -83,6 +87,7 @@ Name[cs]=Otevřít nové okno
|
||||
Name[de]=Neues Fenster öffnen
|
||||
Name[en_GB]=Open new window
|
||||
Name[es]=Abrir nueva ventana
|
||||
Name[fi]=Avaa uusi ikkuna
|
||||
Name[nl]=Nieuw venster openen
|
||||
Name[pt]=Abrir uma nova janela
|
||||
Name[sv]=Öppna nytt fönster
|
||||
@ -100,6 +105,7 @@ Name[cs]=Začít soukromé prohlížení
|
||||
Name[de]=Im privaten Browsermodus starten
|
||||
Name[en_GB]=Start private browsing
|
||||
Name[es]=Iniciar navegación privada
|
||||
Name[fi]=Aloita yksityisselaus
|
||||
Name[nl]=Privébrowsing starten
|
||||
Name[pt]=Iniciar a navegação privada
|
||||
Name[sv]=Starta privat webbläsning
|
||||
|
@ -8,6 +8,7 @@ Name[cs]=Breeze
|
||||
Name[de]=Breeze
|
||||
Name[en_GB]=Breeze
|
||||
Name[es]=Brisa
|
||||
Name[fi]=Breeze
|
||||
Name[fr]=Brise
|
||||
Name[nl]=Breeze
|
||||
Name[pt]=Brisa
|
||||
@ -25,6 +26,7 @@ Comment[cs]=Team Breeze
|
||||
Comment[de]=Breeze-Team
|
||||
Comment[en_GB]=Breeze Team
|
||||
Comment[es]=Equipo de Brisa
|
||||
Comment[fi]=Breeze-työryhmä
|
||||
Comment[nl]=Breeze-team
|
||||
Comment[pt]=Equipa do Brisa
|
||||
Comment[sv]=Breeze-gruppen
|
||||
|
Loading…
Reference in New Issue
Block a user