Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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:
l10n daemon script 2017-08-27 04:43:13 +02:00
parent b8a38cac7c
commit b6dabb55aa
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
linux/applications/org.kde.Falkon.desktop
View File

@ -1,10 +1,19 @@
[Desktop Entry] [Desktop Entry]
Name=Falkon Name=Falkon
Name[ca]=Falkon
Name[ca@valencia]=Falkon
Name[nl]=Falkon
Name[pt]=Falkon
Name[sk]=Falkon
Name[sv]=Falkon
Name[uk]=Falkon
Name[x-test]=xxFalkonxx
Type=Application Type=Application
Icon=qupzilla Icon=qupzilla
Categories=Network;WebBrowser; Categories=Network;WebBrowser;
Comment=A fast and secure web browser Comment=A fast and secure web browser
Comment[ca]=Un navegador web ràpid i segur Comment[ca]=Un navegador web ràpid i segur
Comment[ca@valencia]=Un navegador web ràpid i segur
Comment[nl]=Een snelle en veilige webbrowser Comment[nl]=Een snelle en veilige webbrowser
Comment[pt]=Um navegador Web rápido e seguro Comment[pt]=Um navegador Web rápido e seguro
Comment[sv]=En snabb och säker webbläsare Comment[sv]=En snabb och säker webbläsare
@ -12,11 +21,14 @@ Comment[uk]=Проста і безпечна програма для перег
Comment[x-test]=xxA fast and secure web browserxx Comment[x-test]=xxA fast and secure web browserxx
GenericName=Web Browser GenericName=Web Browser
GenericName[ca]=Navegador web GenericName[ca]=Navegador web
GenericName[ca@valencia]=Navegador web
GenericName[nl]=Webbrowser GenericName[nl]=Webbrowser
GenericName[pt]=Navegador Web GenericName[pt]=Navegador Web
GenericName[sk]=Webový prehliadač
GenericName[sv]=Webbläsare GenericName[sv]=Webbläsare
GenericName[uk]=Переглядач інтернету GenericName[uk]=Переглядач інтернету
GenericName[x-test]=xxWeb Browserxx GenericName[x-test]=xxWeb Browserxx
GenericName[zh_CN]=网页浏览器
Exec=falkon %u Exec=falkon %u
MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;application/x-mimearchive; MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;application/x-mimearchive;
Terminal=false Terminal=false
@ -25,8 +37,10 @@ Actions=NewTab;NewWindow;PrivateBrowsing;
[Desktop Action NewTab] [Desktop Action NewTab]
Name=Open new tab Name=Open new tab
Name[ca]=Obre una pestanya nova Name[ca]=Obre una pestanya nova
Name[ca@valencia]=Obri una pestanya nova
Name[nl]=Nieuw tabblad openen Name[nl]=Nieuw tabblad openen
Name[pt]=Abrir uma nova página Name[pt]=Abrir uma nova página
Name[sk]=Otvoriť novú záložku
Name[sv]=Öppna ny flik Name[sv]=Öppna ny flik
Name[uk]=Відкрити нову вкладку Name[uk]=Відкрити нову вкладку
Name[x-test]=xxOpen new tabxx Name[x-test]=xxOpen new tabxx
@ -35,6 +49,7 @@ Exec=falkon --new-tab
[Desktop Action NewWindow] [Desktop Action NewWindow]
Name=Open new window Name=Open new window
Name[ca]=Obre una finestra nova Name[ca]=Obre una finestra nova
Name[ca@valencia]=Obri una finestra nova
Name[nl]=Nieuw venster openen Name[nl]=Nieuw venster openen
Name[pt]=Abrir uma nova janela Name[pt]=Abrir uma nova janela
Name[sv]=Öppna nytt fönster Name[sv]=Öppna nytt fönster
@ -45,6 +60,7 @@ Exec=falkon --new-window
[Desktop Action PrivateBrowsing] [Desktop Action PrivateBrowsing]
Name=Start private browsing Name=Start private browsing
Name[ca]=Inicia la navegació privada Name[ca]=Inicia la navegació privada
Name[ca@valencia]=Inicia la navegació privada
Name[nl]=Privébrowsing starten Name[nl]=Privébrowsing starten
Name[pt]=Iniciar a navegação privada Name[pt]=Iniciar a navegação privada
Name[sv]=Starta privat webbläsning Name[sv]=Starta privat webbläsning

4
src/lib/data/breeze-fallback/index.theme
View File

@ -1,13 +1,17 @@
[Icon Theme] [Icon Theme]
Name=Breeze Name=Breeze
Name[ca]=Brisa Name[ca]=Brisa
Name[ca@valencia]=Brisa
Name[nl]=Breeze Name[nl]=Breeze
Name[pt]=Brisa Name[pt]=Brisa
Name[sk]=Vánok
Name[sv]=Breeze Name[sv]=Breeze
Name[uk]=Breeze Name[uk]=Breeze
Name[x-test]=xxBreezexx Name[x-test]=xxBreezexx
Name[zh_CN]=微风
Comment=Breeze Team Comment=Breeze Team
Comment[ca]=L'equip Brisa Comment[ca]=L'equip Brisa
Comment[ca@valencia]=L'equip Brisa
Comment[nl]=Breeze-team Comment[nl]=Breeze-team
Comment[pt]=Equipa do Brisa Comment[pt]=Equipa do Brisa
Comment[sv]=Breeze-gruppen Comment[sv]=Breeze-gruppen