From b4eaa10c100bff53d7f53f283505a81fa5988966 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 Feb 2018 05:02:21 +0100 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/plugins/AutoScroll/metadata.desktop | 2 ++ src/plugins/FlashCookieManager/metadata.desktop | 2 ++ src/plugins/GnomeKeyringPasswords/metadata.desktop | 2 ++ src/plugins/GreaseMonkey/metadata.desktop | 2 ++ src/plugins/ImageFinder/metadata.desktop | 2 ++ src/plugins/KWalletPasswords/metadata.desktop | 2 ++ src/plugins/MouseGestures/metadata.desktop | 2 ++ src/plugins/PIM/metadata.desktop | 2 ++ src/plugins/StatusBarIcons/metadata.desktop | 2 ++ src/plugins/TabManager/metadata.desktop | 2 ++ src/plugins/TestPlugin/metadata.desktop | 2 ++ src/plugins/VerticalTabs/metadata.desktop | 2 ++ themes/chrome/metadata.desktop | 2 ++ themes/linux/metadata.desktop | 2 ++ themes/mac/metadata.desktop | 2 ++ themes/windows/metadata.desktop | 2 ++ 16 files changed, 32 insertions(+) diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 5fec13522..8a2c2d6c7 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -2,6 +2,7 @@ Name=AutoScroll Name[ca]=Desplaçament automàtic Name[ca@valencia]=Desplaçament automàtic +Name[en_GB]=AutoScroll Name[fi]=Automaattivieritys Name[nl]=Auto-schuiven Name[pt]=Deslocamento Automático @@ -11,6 +12,7 @@ Name[x-test]=xxAutoScrollxx Comment=Provides support for autoscroll with middle mouse button Comment[ca]=Proporciona suport per al desplaçament automàtic amb el botó mig del ratolí Comment[ca@valencia]=Proporciona suport per al desplaçament automàtic amb el botó mig del ratolí +Comment[en_GB]=Provides support for autoscroll with middle mouse button Comment[fi]=Tarjoaa automaattivieritystuen hiiren keskipainikkeelle Comment[nl]=Bied ondersteuning voor auto-schuiven met middelste muisknop Comment[pt]=Oferece o suporte para o deslocamento automático com o botão do meio do rato diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop index aa638cf5b..cde1e2f35 100644 --- a/src/plugins/FlashCookieManager/metadata.desktop +++ b/src/plugins/FlashCookieManager/metadata.desktop @@ -2,6 +2,7 @@ Name=Flash Cookie Manager Name[ca]=Gestor de galetes Flash Name[ca@valencia]=Gestor de galetes Flash +Name[en_GB]=Flash Cookie Manager Name[fi]=Flash-evästeiden hallinta Name[nl]=Cookiebeheerder van Flash Name[pt]=Gestor de 'Cookies' do Flash @@ -11,6 +12,7 @@ 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[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[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[nl]=U kunt gemakkelijk cookies van flash opgeslagen op uw computer bekijken/verwijderen. Dit is een oplossing om meer privacy te hebben. Comment[pt]=Poderá ver/apagar facilmente os 'cookies' do Flash gravados no seu computador. Esta é uma solução para ter mais privacidade. diff --git a/src/plugins/GnomeKeyringPasswords/metadata.desktop b/src/plugins/GnomeKeyringPasswords/metadata.desktop index 9aec88728..7b1b6737e 100644 --- a/src/plugins/GnomeKeyringPasswords/metadata.desktop +++ b/src/plugins/GnomeKeyringPasswords/metadata.desktop @@ -2,6 +2,7 @@ Name=Gnome Keyring Passwords Name[ca]=Contrasenyes a l'anell de claus de Gnome Name[ca@valencia]=Contrasenyes a l'anell de claus de Gnome +Name[en_GB]=Gnome Keyring Passwords Name[fi]=Gnomen avainrenkaan salasankaat Name[nl]=GNOME-sleutelbos wachtwoorden Name[pt]=Senhas no Porta-Chaves do Gnome @@ -11,6 +12,7 @@ Name[x-test]=xxGnome Keyring Passwordsxx Comment=Provides support for storing passwords in gnome-keyring Comment[ca]=Proporciona suport per emmagatzemar contrasenyes a l'anell de claus de Gnome Comment[ca@valencia]=Proporciona suport per emmagatzemar contrasenyes a l'anell de claus de Gnome +Comment[en_GB]=Provides support for storing passwords in gnome-keyring Comment[fi]=Tarjoaa tuen salasanojen tallentamiseksi Gnomen avainrenkaaseen Comment[nl]=Biedt ondersteuning voor opslaan van GNOME-sleutelbos wachtwoorden Comment[pt]=Oferece o suporte para gravar as senhas no 'gnome-keyring' diff --git a/src/plugins/GreaseMonkey/metadata.desktop b/src/plugins/GreaseMonkey/metadata.desktop index af36070f9..821e887c4 100644 --- a/src/plugins/GreaseMonkey/metadata.desktop +++ b/src/plugins/GreaseMonkey/metadata.desktop @@ -2,6 +2,7 @@ Name=GreaseMonkey Name[ca]=GreaseMonkey Name[ca@valencia]=GreaseMonkey +Name[en_GB]=GreaseMonkey Name[fi]=GreaseMonkey Name[fr]=GreaseMonkey Name[nl]=GreaseMonkey @@ -12,6 +13,7 @@ Name[x-test]=xxGreaseMonkeyxx Comment=Provides support for userscripts Comment[ca]=Proporciona suport per scripts d'usuari Comment[ca@valencia]=Proporciona suport per scripts d'usuari +Comment[en_GB]=Provides support for userscripts Comment[fi]=Tarjoaa käyttäjäskriptien tuen Comment[fr]=Prend en charge les scripts utilisateur. Comment[nl]=Biedt ondersteuning voor scripts van gebruikers diff --git a/src/plugins/ImageFinder/metadata.desktop b/src/plugins/ImageFinder/metadata.desktop index effab0463..fbe9a9d9c 100644 --- a/src/plugins/ImageFinder/metadata.desktop +++ b/src/plugins/ImageFinder/metadata.desktop @@ -2,6 +2,7 @@ Name=ImageFinder Name[ca]=ImageFinder Name[ca@valencia]=ImageFinder +Name[en_GB]=ImageFinder Name[fi]=ImageFinder Name[nl]=ImageFinder Name[pt]=Pesquisa de Imagens @@ -11,6 +12,7 @@ Name[x-test]=xxImageFinderxx Comment=Provides context menu with reverse image search engine support Comment[ca]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges Comment[ca@valencia]=Proporciona un menú contextual amb suport pel motor de busca inversa d'imatges +Comment[en_GB]=Provides context menu with reverse image search engine support Comment[fi]=Tarjoaa kontekstivalikon käänteisen kuvahaun tuen moottorille Comment[nl]=Biedt contextmenu met ondersteuningsengine voor omgekeerd afbeeldingen zoeken Comment[pt]=Oferece um menu de contexto com suporte para pesquisa inversa de imagens nos motores de busca diff --git a/src/plugins/KWalletPasswords/metadata.desktop b/src/plugins/KWalletPasswords/metadata.desktop index 31fbb71ed..b714e5b50 100644 --- a/src/plugins/KWalletPasswords/metadata.desktop +++ b/src/plugins/KWalletPasswords/metadata.desktop @@ -2,6 +2,7 @@ Name=KWallet Passwords Name[ca]=Contrasenyes del KWallet Name[ca@valencia]=Contrasenyes del KWallet +Name[en_GB]=KWallet Passwords Name[fi]=KWallet-salasanat Name[nl]=Wachtwoorden in KWallet Name[pt]=Senhas do KWallet @@ -11,6 +12,7 @@ Name[x-test]=xxKWallet Passwordsxx Comment=Provides support for storing passwords in KWallet Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport per emmagatzemar contrasenyes al KWallet +Comment[en_GB]=Provides support for storing passwords in KWallet Comment[fi]=Tarjoaa tuen salasanojen tallentamiseksi KWalletiin Comment[nl]=Biedt ondersteuning voor opslaan wachtwoorden in KWallet Comment[pt]=Oferece o suporte para guardar as senhas no KWallet diff --git a/src/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index b1969506f..042ed548f 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -2,6 +2,7 @@ Name=Mouse Gestures Name[ca]=Gestos del ratolí Name[ca@valencia]=Gestos del ratolí +Name[en_GB]=Mouse Gestures Name[fi]=Hiirieleet Name[nl]=Muisgebaren Name[pt]=Gestos do Rato @@ -11,6 +12,7 @@ Name[x-test]=xxMouse Gesturesxx Comment=Provides support for navigating in webpages by mouse gestures Comment[ca]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí Comment[ca@valencia]=Proporciona suport per navegar per les pàgines web amb gestos del ratolí +Comment[en_GB]=Provides support for navigating in webpages by mouse gestures Comment[fi]=Tarjoaa tuen verkkosivujen selaamiseksi hiirielein Comment[nl]=Biedt ondersteuning voor navigeren in webpagina's door muisgebaren Comment[pt]=Oferece o suporte para navegar nas páginas Web com gestos do rato diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop index aadcaaa85..e6426e611 100644 --- a/src/plugins/PIM/metadata.desktop +++ b/src/plugins/PIM/metadata.desktop @@ -2,6 +2,7 @@ Name=PIM Name[ca]=PIM Name[ca@valencia]=PIM +Name[en_GB]=PIM Name[fi]=Henkilökohtainen ajanhallinta Name[fr]=PIM Name[nl]=PIM @@ -13,6 +14,7 @@ Name[zh_CN]=个人信息管理 Comment=Adds ability for Falkon to store some personal data Comment[ca]=Afegeix la possibilitat del Falkon per emmagatzemar diverses dades personals Comment[ca@valencia]=Afig la possibilitat del Falkon per emmagatzemar diverses dades personals +Comment[en_GB]=Adds ability for Falkon to store some personal data Comment[fi]=Lisää Falkoniin kyvyn tallentaa henkilökohtaista tietoa Comment[nl]=Biedt mogelijkheid voor Falkon om enige persoonlijke gegevens op te slaan Comment[pt]=Adiciona ao Falkon a capacidade de guardar alguns dados pessoais diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop index 55282fe37..e1548ebb7 100644 --- a/src/plugins/StatusBarIcons/metadata.desktop +++ b/src/plugins/StatusBarIcons/metadata.desktop @@ -2,6 +2,7 @@ Name=StatusBar Icons Name[ca]=Icones de la barra d'estat Name[ca@valencia]=Icones de la barra d'estat +Name[en_GB]=StatusBar Icons Name[fi]=Tilarivin kuvakkeet Name[nl]=Pictogrammen op de statusbalk Name[pt]=Ícones da Barra de Estado @@ -11,6 +12,7 @@ Name[x-test]=xxStatusBar Iconsxx Comment=Adds additional icons and zoom widget to statusbar Comment[ca]=Afegeix icones addicionals i un estri de zoom a la barra d'estat Comment[ca@valencia]=Afig icones addicionals i un estri de zoom a la barra d'estat +Comment[en_GB]=Adds additional icons and zoom widget to statusbar Comment[fi]=Lisää tilariville kuvakkeita ja lähennyssovelman Comment[nl]=Voegt extra pictogrammen en zoomwidget toe aan de statusbalk Comment[pt]=Adiciona ícones extra e um item de ampliação à barra de estado diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index 5f3809399..7fea16a6d 100644 --- a/src/plugins/TabManager/metadata.desktop +++ b/src/plugins/TabManager/metadata.desktop @@ -2,6 +2,7 @@ Name=Tab Manager Name[ca]=Gestor de pestanyes Name[ca@valencia]=Gestor de pestanyes +Name[en_GB]=Tab Manager Name[fi]=Välilehtien hallinta Name[nl]=Tabbladbeheerder Name[pt]=Gestor de Páginas @@ -11,6 +12,7 @@ Name[x-test]=xxTab Managerxx Comment=Adds ability to managing tabs and windows Comment[ca]=Afegeix la possibilitat de gestionar pestanyes i finestres Comment[ca@valencia]=Afig la possibilitat de gestionar pestanyes i finestres +Comment[en_GB]=Adds ability to managing tabs and windows Comment[fi]=Lisää kyvyn hallita välilehtiä ja ikkunoita Comment[nl]=Voegt mogelijkheid toe om tabbladen en vensters te beheren Comment[pt]=Adiciona a capacidade para gerir páginas e janelas diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index c4f009956..c637e0dce 100644 --- a/src/plugins/TestPlugin/metadata.desktop +++ b/src/plugins/TestPlugin/metadata.desktop @@ -2,6 +2,7 @@ Name=Example Plugin Name[ca]=Connector d'exemple Name[ca@valencia]=Connector d'exemple +Name[en_GB]=Example Plugin Name[fi]=Esimerkkiliitännäinen Name[nl]=Voorbeeld plug-in Name[pt]='Plugin' de Exemplo @@ -11,6 +12,7 @@ Name[x-test]=xxExample Pluginxx Comment=Very simple minimal plugin example Comment[ca]=Exemple molt senzill de connector mínim Comment[ca@valencia]=Exemple molt senzill de connector mínim +Comment[en_GB]=Very simple minimal plugin example Comment[fi]=Hyvin yksinkertainen esimerkki minimaalisesta liitännäisestä Comment[nl]=Zeer eenvoudige minimaal voorbeeld voor plug-in Comment[pt]='Plugin' de exemplo muito simples e minimalista diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index 00f1a28f0..13a37a86e 100644 --- a/src/plugins/VerticalTabs/metadata.desktop +++ b/src/plugins/VerticalTabs/metadata.desktop @@ -2,6 +2,7 @@ Name=Vertical Tabs Name[ca]=Pestanyes verticals Name[ca@valencia]=Pestanyes verticals +Name[en_GB]=Vertical Tabs Name[fi]=Pystyvälilehdet Name[nl]=Verticale tabbladen Name[pt]=Páginas Verticais @@ -11,6 +12,7 @@ Name[x-test]=xxVertical Tabsxx Comment=Adds ability to show tabs in sidebar Comment[ca]=Afegeix la possibilitat de mostrar pestanyes a la barra lateral Comment[ca@valencia]=Afig la possibilitat de mostrar 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[nl]=Voegt mogelijkheid toe om tabbladen in de zijbalk te tonen Comment[pt]=Adiciona a capacidade de mostrar as páginas na barra lateral diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index ed56db947..540a3e4fc 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -2,6 +2,7 @@ Name=Chrome Name[ca]=Chrome Name[ca@valencia]=Chrome +Name[en_GB]=Chrome Name[fi]=Chrome Name[nl]=Chrome Name[pt]=Chrome @@ -11,6 +12,7 @@ Name[x-test]=xxChromexx 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@valencia]=Tema paregut 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[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema Comment[nl]=Op Chrome lijkend thema voor Falkon gebaseerd op Firefox Chromifox thema Comment[pt]=Tema semelhante ao Chrome para o Falkon, baseado no tema Chromifox do Firefox diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index 4b5fba5ea..da2d125c3 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -2,6 +2,7 @@ Name=Linux Name[ca]=Linux Name[ca@valencia]=Linux +Name[en_GB]=Linux Name[fi]=Linux Name[nl]=Linux Name[pt]=Linux @@ -12,6 +13,7 @@ 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 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 al 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[nl]=Standaard eenvoudig thema voor Linux met inheemse widgetstijl en enige basis pictogrammen uit set pictogrammen voor bureaublad Comment[pt]=Tema predefinido simples para o Linux, usando o estilo gráfico nativo e alguns ícones básicos do conjunto de ícones do ambiente de trabalho diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 5b11ce270..e8eee670b 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -2,6 +2,7 @@ Name=Mac Name[ca]=Mac Name[ca@valencia]=Mac +Name[en_GB]=Mac Name[fi]=Mac Name[nl]=Mac Name[pt]=Mac @@ -11,6 +12,7 @@ Name[x-test]=xxMacxx 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@valencia]=Tema paregut 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[fi]=Firefoxin Mac OS X -teemaan pohjautuva Macin kaltainen Falkon-teema Comment[nl]=Op Mac lijkend thema voor Falkon gebaseerd op Firefox Mac OS X thema Comment[pt]=Tema semelhante ao Mac para o Falkon, baseado no tema Mac OS X do Firefox diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index ab43d18ea..924034c50 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -2,6 +2,7 @@ Name=Windows Name[ca]=Windows Name[ca@valencia]=Windows +Name[en_GB]=Windows Name[fi]=Windows Name[nl]=Windows Name[pt]=Windows @@ -12,6 +13,7 @@ Name[zh_CN]=窗口 Comment=Windows like theme based on 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[en_GB]=Windows like theme based on Material design Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema Comment[nl]=Op Windows lijkend thema gebaseerd op Material ontwerp Comment[pt]=Tema semelhante ao Windows, baseado no 'material design'