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"
8 years ago · 680b07008a
parent d329db7a08
commit 680b07008a
18 changed files with 32 additions and 0 deletions
--- 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[cs]=AdBlock
 Name[de]=AdBlock
 Name[en_GB]=AdBlock
 Name[nl]=AdBlock
@ -13,6 +14,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[cs]=Blokovat nevyžádaný obsah
 Comment[de]=Blockiert unerwünschte Web-Inhalte
 Comment[en_GB]=Blocks unwanted web content
 Comment[nl]=Blokkeert niet-gewilde webinhoud
--- 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[cs]=Automatické posouvání
 Name[en_GB]=AutoScroll
 Name[fi]=Automaattivieritys
 Name[it]=Scorrimento automatico
--- 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[cs]=Správce cookies pro Flash
 Name[en_GB]=Flash Cookie Manager
 Name[fi]=Flash-evästeiden hallinta
 Name[it]=Gestore dei cookie in flash
--- 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[cs]=Hesla z klíčenky Gnome
 Name[en_GB]=Gnome Keyring Passwords
 Name[fi]=Gnomen avainrenkaan salasankaat
 Name[it]=Portachiavi per le chiavi di Gnome
@ -13,6 +14,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[cs]=Poskytuje podporu pro ukládání hesel pomocí gnome-keyring
 Comment[en_GB]=Provides support for storing passwords in gnome-keyring
 Comment[fi]=Tarjoaa tuen salasanojen tallentamiseksi Gnomen avainrenkaaseen
 Comment[it]=Fornisce un supporto all'immagazzinamento delle password nel portachiavi di Gnome
--- 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[cs]=GreaseMonkey
 Name[de]=GreaseMonkey
 Name[en_GB]=GreaseMonkey
 Name[fi]=GreaseMonkey
@ -15,6 +16,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[cs]=Poskytuje podporu pro uživatelské skripty
 Comment[en_GB]=Provides support for userscripts
 Comment[fi]=Tarjoaa käyttäjäskriptien tuen
 Comment[fr]=Prend en charge les scripts utilisateur.
--- 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[cs]=Gesta myší
 Name[de]=Maus-Gesten
 Name[en_GB]=Mouse Gestures
 Name[fi]=Hiirieleet
@ -14,6 +15,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[cs]=Poskytuje podporu pro procházení webových stránek pomocí gest myší
 Comment[en_GB]=Provides support for navigating in webpages by mouse gestures
 Comment[fi]=Tarjoaa tuen verkkosivujen selaamiseksi hiirielein
 Comment[it]=Fornisce un supporto alla navigazione nelle pagine web per mezzo di gesti del mouse
--- 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[cs]=PIM
 Name[de]=PIM
 Name[en_GB]=PIM
 Name[fi]=Henkilökohtainen ajanhallinta
@ -16,6 +17,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[cs]=Přidává Falkonu schopnost ukládat nějaká osobní data
 Comment[en_GB]=Adds ability for Falkon to store some personal data
 Comment[fi]=Lisää Falkoniin kyvyn tallentaa henkilökohtaista tietoa
 Comment[it]=Aggiunge a Falkon la capacità di immagazzinare alcuni dati personali
--- 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[cs]=Ikony stavové lišty
 Name[de]=Statusleisten-Symbole
 Name[en_GB]=StatusBar Icons
 Name[fi]=Tilarivin kuvakkeet
@ -14,6 +15,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[cs]=Přidává dodatečné ikony a přibližovací widget do stavové lišty
 Comment[en_GB]=Adds additional icons and zoom widget to statusbar
 Comment[fi]=Lisää tilariville kuvakkeita ja lähennyssovelman
 Comment[it]=Aggiunge alla barra di stato alcune icone aggiuntive ed uno strumento di ingrandimento
--- 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[cs]=Správce karet
 Name[de]=Unterfensterverwaltung
 Name[en_GB]=Tab Manager
 Name[fi]=Välilehtien hallinta
@ -14,6 +15,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[cs]=Přidává schopnost správy karet a oken
 Comment[en_GB]=Adds ability to managing tabs and windows
 Comment[fi]=Lisää kyvyn hallita välilehtiä ja ikkunoita
 Comment[it]=Aggiunge la capacità di gestione delle schede e delle finestre
--- 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[cs]=Ukázkový modul
 Name[en_GB]=Example Plugin
 Name[fi]=Esimerkkiliitännäinen
 Name[it]=Estensione di esempio
@ -13,6 +14,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[cs]=Jednoduchá ukázka modulu
 Comment[en_GB]=Very simple minimal plugin example
 Comment[fi]=Hyvin yksinkertainen esimerkki minimaalisesta liitännäisestä
 Comment[it]=Estensione di esempio molto semplice e minimale
--- 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[cs]=Svislé karty
 Name[en_GB]=Vertical Tabs
 Name[fi]=Pystyvälilehdet
 Name[it]=Schede verticali
@ -13,6 +14,7 @@ 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 les pestanyes a la barra lateral
+Comment[cs]=Přidává schopnost zobrazit karty v postranní liště
 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
--- a/src/scripts/hellopython/metadata.desktop
+++ b/src/scripts/hellopython/metadata.desktop
@ -2,6 +2,7 @@
 Name=Hello Python
 Name[ca]=Hola Python
 Name[ca@valencia]=Hola Python
+Name[cs]=Hello Python
 Name[en_GB]=Hello Python
 Name[nl]=Hallo Python
 Name[pt]=Olá em Python
@ -11,6 +12,7 @@ Name[x-test]=xxHello Pythonxx
 Comment=Example Python extension
 Comment[ca]=Exemple d'una extensió en Python
 Comment[ca@valencia]=Exemple d'una extensió en Python
+Comment[cs]=Ukázkové rozšíření v Pythonu
 Comment[en_GB]=Example Python extension
 Comment[nl]=Voorbeeld Python-extensie
 Comment[pt]=Extensão de exemplo em Python
--- a/src/scripts/runaction/actions/dictionary.desktop
+++ b/src/scripts/runaction/actions/dictionary.desktop
@ -2,6 +2,7 @@
 Name=Dictionary
 Name[ca]=Diccionari
 Name[ca@valencia]=Diccionari
+Name[cs]=Slovník
 Name[de]=Wörterbuch
 Name[en_GB]=Dictionary
 Name[fr]=Dictionnaire
--- a/src/scripts/runaction/actions/googleimagesearch.desktop
+++ b/src/scripts/runaction/actions/googleimagesearch.desktop
@ -2,6 +2,7 @@
 Name=Google
 Name[ca]=Google
 Name[ca@valencia]=Google
+Name[cs]=Google
 Name[de]=Google
 Name[en_GB]=Google
 Name[fr]=Google
--- a/themes/chrome/metadata.desktop
+++ b/themes/chrome/metadata.desktop
@ -2,6 +2,7 @@
 Name=Chrome
 Name[ca]=Chrome
 Name[ca@valencia]=Chrome
+Name[cs]=Chrome
 Name[de]=Chrome
 Name[en_GB]=Chrome
 Name[fi]=Chrome
@ -14,6 +15,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 semblant al Chrome pel Falkon basat en el tema Chromifox del Firefox
+Comment[cs]=Motiv pro Falkon podobný Chrome založený na motivu Firefox Chromifox
 Comment[en_GB]=Chrome like theme for Falkon based on Firefox Chromifox theme
 Comment[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema
 Comment[it]=Tema di tipo Chrome per Falkon, basato sul tema Chromifox di Firefox
--- a/themes/linux/metadata.desktop
+++ b/themes/linux/metadata.desktop
@ -2,6 +2,7 @@
 Name=Linux
 Name[ca]=Linux
 Name[ca@valencia]=Linux
+Name[cs]=Linux
 Name[de]=Linux
 Name[en_GB]=Linux
 Name[fi]=Linux
@ -15,6 +16,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 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 a Linux usant l'estil d'estris natiu i diverses icones bàsiques del conjunt d'icones de l'escriptori
+Comment[cs]=Výchozí jednoduchý motiv pro Linux používající nativní styl widgetu style a nějaké základní ikony ze sady ikon pracovní plochy
 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
--- a/themes/mac/metadata.desktop
+++ b/themes/mac/metadata.desktop
@ -2,6 +2,7 @@
 Name=Mac
 Name[ca]=Mac
 Name[ca@valencia]=Mac
+Name[cs]=Mac
 Name[de]=Mac
 Name[en_GB]=Mac
 Name[fi]=Mac
@ -15,6 +16,7 @@ Name[zh_CN]=Mac
 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 semblant al Mac pel Falkon basat en el tema Mac OS X del Firefox
+Comment[cs]=Motiv pro Falkon podobný Macu založený na motivu Firefox Mac OS X
 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[it]=Tema di tipo Mac per Falkon, basato sul tema Mac OS X di Firefox
--- a/themes/windows/metadata.desktop
+++ b/themes/windows/metadata.desktop
@ -2,6 +2,7 @@
 Name=Windows
 Name[ca]=Windows
 Name[ca@valencia]=Windows
+Name[cs]=Windows
 Name[de]=Windows
 Name[en_GB]=Windows
 Name[fi]=Windows
@ -15,6 +16,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 semblant al Windows basat en el «Material design»
+Comment[cs]=Motiv podobný Windows založený na designu Material
 Comment[en_GB]=Windows like theme based on Material design
 Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema
 Comment[it]=Tema di tipo Windows, basato sul design Material