Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +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-09-03 04:44:27 +02:00
parent 3dc4685561
commit 691723e4f6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Falkon Name=Falkon
Name[ar]=فالكون
Name[ca]=Falkon Name[ca]=Falkon
Name[ca@valencia]=Falkon Name[ca@valencia]=Falkon
Name[cs]=Falkon Name[cs]=Falkon
@ -14,6 +15,7 @@ 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[ar]=متصفّح وبّ سريع وآمن
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[ca@valencia]=Un navegador web ràpid i segur
Comment[cs]=Rychlý a bezpečný webový prohlížeč Comment[cs]=Rychlý a bezpečný webový prohlížeč
@ -24,6 +26,7 @@ Comment[sv]=En snabb och säker webbläsare
Comment[uk]=Проста і безпечна програма для перегляду інтернету 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[ar]=متصفّح وبّ
GenericName[ca]=Navegador web GenericName[ca]=Navegador web
GenericName[ca@valencia]=Navegador web GenericName[ca@valencia]=Navegador web
GenericName[cs]=Webový prohlížeč GenericName[cs]=Webový prohlížeč
@ -42,6 +45,7 @@ Actions=NewTab;NewWindow;PrivateBrowsing;
[Desktop Action NewTab] [Desktop Action NewTab]
Name=Open new tab Name=Open new tab
Name[ar]=افتح لسانًا جديدًا
Name[ca]=Obre una pestanya nova Name[ca]=Obre una pestanya nova
Name[ca@valencia]=Obri una pestanya nova Name[ca@valencia]=Obri una pestanya nova
Name[cs]=Otevřít novou kartu Name[cs]=Otevřít novou kartu
@ -56,6 +60,7 @@ Exec=falkon --new-tab
[Desktop Action NewWindow] [Desktop Action NewWindow]
Name=Open new window Name=Open new window
Name[ar]=افتح نافذة جديدة
Name[ca]=Obre una finestra nova Name[ca]=Obre una finestra nova
Name[ca@valencia]=Obri una finestra nova Name[ca@valencia]=Obri una finestra nova
Name[cs]=Otevřít nové okno Name[cs]=Otevřít nové okno
@ -69,6 +74,7 @@ Exec=falkon --new-window
[Desktop Action PrivateBrowsing] [Desktop Action PrivateBrowsing]
Name=Start private browsing Name=Start private browsing
Name[ar]=ابدأ التّصفّح الخاصّ
Name[ca]=Inicia la navegació privada Name[ca]=Inicia la navegació privada
Name[ca@valencia]=Inicia la navegació privada Name[ca@valencia]=Inicia la navegació privada
Name[cs]=Začít soukromé prohlížení Name[cs]=Začít soukromé prohlížení

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

@ -1,5 +1,6 @@
[Icon Theme] [Icon Theme]
Name=Breeze Name=Breeze
Name[ar]=نسيم
Name[ca]=Brisa Name[ca]=Brisa
Name[ca@valencia]=Brisa Name[ca@valencia]=Brisa
Name[cs]=Breeze Name[cs]=Breeze
@ -12,6 +13,7 @@ Name[uk]=Breeze
Name[x-test]=xxBreezexx Name[x-test]=xxBreezexx
Name[zh_CN]=微风 Name[zh_CN]=微风
Comment=Breeze Team Comment=Breeze Team
Comment[ar]=فريق نسيم
Comment[ca]=L'equip Brisa Comment[ca]=L'equip Brisa
Comment[ca@valencia]=L'equip Brisa Comment[ca@valencia]=L'equip Brisa
Comment[cs]=Team Breeze Comment[cs]=Team Breeze