From 4c7f7cfc2ecf3a1bee17eb8b864a62684a402956 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 26 Mar 2018 05:08:41 +0200 Subject: [PATCH] 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" --- src/lib/adblock/metadata.desktop | 2 ++ src/plugins/VerticalTabs/metadata.desktop | 2 +- themes/linux/metadata.desktop | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 0652ebedd..15d594570 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -2,6 +2,7 @@ Name=AdBlock Name[ca]=AdBlock Name[ca@valencia]=AdBlock +Name[de]=AdBlock Name[en_GB]=AdBlock Name[nl]=AdBlock Name[pt]=AdBlock @@ -12,6 +13,7 @@ Name[x-test]=xxAdBlockxx Comment=Blocks unwanted web content Comment[ca]=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[nl]=Blokkeert niet-gewilde webinhoud Comment[pt]=Bloqueia o conteúdo Web indesejado diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index 106bd4ac2..0c4268520 100644 --- a/src/plugins/VerticalTabs/metadata.desktop +++ b/src/plugins/VerticalTabs/metadata.desktop @@ -12,7 +12,7 @@ Name[uk]=Вертикальні вкладки Name[x-test]=xxVertical Tabsxx Comment=Adds ability to show tabs in sidebar 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[fi]=Lisää kyvyn näyttää välilehdet sivupalkissa Comment[it]=Aggiunge la capacità di mostrare le schede nella barra laterale diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index 75e0e1ede..8844d3559 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -14,7 +14,7 @@ Name[x-test]=xxLinuxxx Name[zh_CN]=Linux 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@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[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