Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36: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 2018-03-26 05:08:41 +02:00
parent 162f09901d
commit 4c7f7cfc2e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
Name=AdBlock Name=AdBlock
Name[ca]=AdBlock Name[ca]=AdBlock
Name[ca@valencia]=AdBlock Name[ca@valencia]=AdBlock
Name[de]=AdBlock
Name[en_GB]=AdBlock Name[en_GB]=AdBlock
Name[nl]=AdBlock Name[nl]=AdBlock
Name[pt]=AdBlock Name[pt]=AdBlock
@ -12,6 +13,7 @@ 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[ca@valencia]=Bloqueja el contingut web no desitjat
Comment[de]=Blockiert unerwünschte Web-Inhalte
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/VerticalTabs/metadata.desktop
View File

@ -12,7 +12,7 @@ Name[uk]=Вертикальні вкладки
Name[x-test]=xxVertical Tabsxx Name[x-test]=xxVertical Tabsxx
Comment=Adds ability to show tabs in sidebar Comment=Adds ability to show tabs in sidebar
Comment[ca]=Afegeix la possibilitat de mostrar les pestanyes a la barra lateral Comment[ca]=Afegeix la possibilitat de mostrar les pestanyes a la barra lateral
Comment[ca@valencia]=Afig la possibilitat de mostrar pestanyes a la barra lateral Comment[ca@valencia]=Afig la possibilitat de mostrar les pestanyes a la barra lateral
Comment[en_GB]=Adds ability to show tabs in sidebar Comment[en_GB]=Adds ability to show tabs in sidebar
Comment[fi]=Lisää kyvyn näyttää välilehdet sivupalkissa Comment[fi]=Lisää kyvyn näyttää välilehdet sivupalkissa
Comment[it]=Aggiunge la capacità di mostrare le schede nella barra laterale Comment[it]=Aggiunge la capacità di mostrare le schede nella barra laterale

2
themes/linux/metadata.desktop
View File

@ -14,7 +14,7 @@ Name[x-test]=xxLinuxxx
Name[zh_CN]=Linux Name[zh_CN]=Linux
Comment=Default simple theme for Linux using native widget style and some basic icons from desktop icon set Comment=Default simple theme for Linux using native widget style and some basic icons from desktop icon set
Comment[ca]=Tema senzill predeterminat per a Linux usant l'estil d'estris natiu i diverses icones bàsiques del conjunt d'icones de l'escriptori Comment[ca]=Tema senzill predeterminat per a Linux usant l'estil d'estris natiu i diverses icones bàsiques del conjunt d'icones de l'escriptori
Comment[ca@valencia]=Tema senzill predeterminat per al Linux usant l'estil d'estris natiu i diverses icones bàsiques del conjunt d'icones de l'escriptori Comment[ca@valencia]=Tema senzill predeterminat per a Linux usant l'estil d'estris natiu i diverses icones bàsiques del conjunt d'icones de l'escriptori
Comment[en_GB]=Default simple theme for Linux using native widget style and some basic icons from desktop icon set Comment[en_GB]=Default simple theme for Linux using native widget style and some basic icons from desktop icon set
Comment[fi]=Yksinkertainen natiivia elementtityyliä käyttävä Linux-teema sekä joitakin kuvakkeita työpöytäkuvakejoukosta Comment[fi]=Yksinkertainen natiivia elementtityyliä käyttävä Linux-teema sekä joitakin kuvakkeita työpöytäkuvakejoukosta
Comment[it]=Semplice tema predefinito per Linux, che usa lo stile nativo degli oggetti ed alcune icone di base dall'insieme di icone del desktop Comment[it]=Semplice tema predefinito per Linux, che usa lo stile nativo degli oggetti ed alcune icone di base dall'insieme di icone del desktop