Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +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 2018-03-13 05:19:52 +01:00
parent 41c4ff165b
commit cc2b424aeb
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/adblock/metadata.desktop
View File

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=AdBlock Name=AdBlock
Name[ca]=AdBlock Name[ca]=AdBlock
Name[ca@valencia]=AdBlock
Name[en_GB]=AdBlock Name[en_GB]=AdBlock
Name[nl]=AdBlock Name[nl]=AdBlock
Name[pt]=AdBlock Name[pt]=AdBlock
@ -10,6 +11,7 @@ Name[uk]=Блокування реклами
Name[x-test]=xxAdBlockxx Name[x-test]=xxAdBlockxx
Comment=Blocks unwanted web content Comment=Blocks unwanted web content
Comment[ca]=Bloqueja el contingut web no desitjat Comment[ca]=Bloqueja el contingut web no desitjat
Comment[ca@valencia]=Bloqueja el contingut web no desitjat
Comment[en_GB]=Blocks unwanted web content Comment[en_GB]=Blocks unwanted web content
Comment[nl]=Blokkeert niet-gewilde webinhoud Comment[nl]=Blokkeert niet-gewilde webinhoud
Comment[pt]=Bloqueia o conteúdo Web indesejado Comment[pt]=Bloqueia o conteúdo Web indesejado

2
src/plugins/FlashCookieManager/metadata.desktop
View File

@ -12,7 +12,7 @@ Name[uk]=Керування куками Flash
Name[x-test]=xxFlash Cookie Managerxx Name[x-test]=xxFlash Cookie Managerxx
Comment=You can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy. Comment=You can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy.
Comment[ca]=Podeu veure/eliminar fàcilment les galetes Flash emmagatzemades a l'ordinador. Aquesta és una solució per tenir més privacitat. Comment[ca]=Podeu veure/eliminar fàcilment les galetes Flash emmagatzemades a l'ordinador. Aquesta és una solució per tenir més privacitat.
Comment[ca@valencia]=Podeu veure/eliminar fàcilment les galetes Flash emmagatzemades a l'ordinador. Esta és una solució per tindre més privacitat. Comment[ca@valencia]=Podeu veure/eliminar fàcilment les galetes Flash emmagatzemades a l'ordinador. Aquesta és una solució per tindre més privacitat.
Comment[en_GB]=You can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy. Comment[en_GB]=You can easily view/delete flash cookies stored on your computer. This is a solution for having more privacy.
Comment[fi]=Voit helposti tarkastella ja poistaa tietokoneelle tallennettuja Flash-evästeitä. Ratkaisu parantaa yksityisyytesi suojaa. Comment[fi]=Voit helposti tarkastella ja poistaa tietokoneelle tallennettuja Flash-evästeitä. Ratkaisu parantaa yksityisyytesi suojaa.
Comment[it]=Puoi vedere o cancellare in maniera semplice i cookie in flash immagazzinati nel tuo computer. È una soluzione per avere una maggior privacy. Comment[it]=Puoi vedere o cancellare in maniera semplice i cookie in flash immagazzinati nel tuo computer. È una soluzione per avere una maggior privacy.

2
src/scripts/hellopython/metadata.desktop
View File

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=Hello Python Name=Hello Python
Name[ca]=Hola Python Name[ca]=Hola Python
Name[ca@valencia]=Hola Python
Name[en_GB]=Hello Python Name[en_GB]=Hello Python
Name[nl]=Hallo Python Name[nl]=Hallo Python
Name[pt]=Olá em Python Name[pt]=Olá em Python
@ -9,6 +10,7 @@ Name[uk]=Привіт, Python
Name[x-test]=xxHello Pythonxx Name[x-test]=xxHello Pythonxx
Comment=Example Python extension Comment=Example Python extension
Comment[ca]=Exemple d'una extensió en Python Comment[ca]=Exemple d'una extensió en Python
Comment[ca@valencia]=Exemple d'una extensió en Python
Comment[en_GB]=Example Python extension Comment[en_GB]=Example Python extension
Comment[nl]=Voorbeeld Python-extensie Comment[nl]=Voorbeeld Python-extensie
Comment[pt]=Extensão de exemplo em Python Comment[pt]=Extensão de exemplo em Python

2
themes/chrome/metadata.desktop
View File

@ -12,7 +12,7 @@ Name[uk]=Хромування
Name[x-test]=xxChromexx Name[x-test]=xxChromexx
Comment=Chrome like theme for Falkon based on Firefox Chromifox theme Comment=Chrome like theme for Falkon based on Firefox Chromifox theme
Comment[ca]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Firefox Comment[ca]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Firefox
Comment[ca@valencia]=Tema paregut al Chrome pel Falkon basat en el tema Chromifox del Firefox Comment[ca@valencia]=Tema semblant al Chrome pel Falkon basat en el tema Chromifox del Firefox
Comment[en_GB]=Chrome like theme for Falkon based on Firefox Chromifox theme Comment[en_GB]=Chrome like theme for Falkon based on Firefox Chromifox theme
Comment[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema Comment[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema
Comment[it]=Tema di tipo Chrome per Falkon, basato sul tema Chromifox di Firefox Comment[it]=Tema di tipo Chrome per Falkon, basato sul tema Chromifox di Firefox

2
themes/mac/metadata.desktop
View File

@ -13,7 +13,7 @@ Name[x-test]=xxMacxx
Name[zh_CN]=Mac Name[zh_CN]=Mac
Comment=Mac like theme for Falkon based on Firefox Mac OS X theme Comment=Mac like theme for Falkon based on Firefox Mac OS X theme
Comment[ca]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox Comment[ca]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox
Comment[ca@valencia]=Tema paregut al Mac pel Falkon basat en el tema Mac OS X del Firefox Comment[ca@valencia]=Tema semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox
Comment[en_GB]=Mac like theme for Falkon based on Firefox Mac OS X theme Comment[en_GB]=Mac like theme for Falkon based on Firefox Mac OS X theme
Comment[fi]=Firefoxin Mac OS X -teemaan pohjautuva Macin kaltainen Falkon-teema Comment[fi]=Firefoxin Mac OS X -teemaan pohjautuva Macin kaltainen Falkon-teema
Comment[it]=Tema di tipo Mac per Falkon, basato sul tema Mac OS X di Firefox Comment[it]=Tema di tipo Mac per Falkon, basato sul tema Mac OS X di Firefox

2
themes/windows/metadata.desktop
View File

@ -13,7 +13,7 @@ Name[x-test]=xxWindowsxx
Name[zh_CN]=窗口 Name[zh_CN]=窗口
Comment=Windows like theme based on Material design Comment=Windows like theme based on Material design
Comment[ca]=Tema semblant al Windows basat en el «Material design» Comment[ca]=Tema semblant al Windows basat en el «Material design»
Comment[ca@valencia]=Tema paregut al Windows basat en el «Material design» Comment[ca@valencia]=Tema semblant al Windows basat en el «Material design»
Comment[en_GB]=Windows like theme based on Material design Comment[en_GB]=Windows like theme based on Material design
Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema
Comment[it]=Tema di tipo Windows, basato sul design Material Comment[it]=Tema di tipo Windows, basato sul design Material