1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00

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"
This commit is contained in:
l10n daemon script 2020-02-12 06:06:11 +01:00
parent 9eaffd1208
commit e0ea9fd04c
9 changed files with 12 additions and 0 deletions

View File

@ -12,6 +12,7 @@ Name[et]=Falkon
Name[fi]=Falkon
Name[fr]=Falkon
Name[gl]=Falkon
Name[ia]=Falkon:
Name[id]=Falkon
Name[it]=Falkon
Name[ko]=Falkon
@ -72,6 +73,7 @@ GenericName[et]=Veebilehitseja
GenericName[fi]=Verkkoselain
GenericName[fr]=Navigateur Web
GenericName[gl]=Navegador web
GenericName[ia]=Navigator Web
GenericName[id]=Penelusur Web
GenericName[it]=Browser web
GenericName[ko]=

View File

@ -11,6 +11,7 @@ Name[et]=AdBlock
Name[fi]=Mainosesto
Name[fr]=AdBlock
Name[gl]=Bloqueador de publicidade
Name[ia]=Adblock (bloco de reclamos)
Name[id]=AdBlock
Name[it]=Adblock
Name[ko]=AdBlock

View File

@ -12,6 +12,7 @@ Name[et]=Breeze
Name[fi]=Breeze
Name[fr]=Breeze
Name[gl]=Breeze
Name[ia]=Brisa
Name[id]=Breeze
Name[it]=Brezza
Name[ko]=Breeze

View File

@ -3,6 +3,7 @@ Name=Hello Qml
Name[ca]=Hola Qml
Name[ca@valencia]=Hola Qml
Name[cs]=Ahoj QML
Name[da]=Hello Qml
Name[de]=Hallo QML
Name[en_GB]=Hello QML
Name[es]=Hola Qml
@ -29,6 +30,7 @@ Comment=Sample Qml Plugin
Comment[ca]=Connector Qml d'exemple
Comment[ca@valencia]=Connector Qml d'exemple
Comment[cs]=Ukázkový modul QML
Comment[da]=Eksempel på Qml-plugin
Comment[de]=Beispielmodul in Qml
Comment[en_GB]=Sample QML Plugin
Comment[es]=Complemento de ejemplo de Qml

View File

@ -3,6 +3,7 @@ Name=MiddleClickLoader
Name[ca]=MiddleClickLoader
Name[ca@valencia]=MiddleClickLoader
Name[cs]=Načtení prostředním tlačítkem myši
Name[da]=MidterKlikIndlæsning
Name[de]=Mittelklick-Lader
Name[en_GB]=MiddleClickLoader
Name[es]=Cargador de clic central
@ -29,6 +30,7 @@ Comment=Load text in selection clipboard as URL
Comment[ca]=Carrega text com a URL en una selecció del porta-retalls
Comment[ca@valencia]=Carrega text com a URL en una selecció del porta-retalls
Comment[cs]=Načíst text ve schránce výběru jako URL
Comment[da]=Indlæs tekst i markeringsudklipsholder som URL
Comment[de]=Text in der Auswahl der Zwischenablage als URL laden
Comment[en_GB]=Load text in selection clipboard as URL
Comment[es]=Cargar texto seleccionado en el portapapeles como URL

View File

@ -11,6 +11,7 @@ Name[et]=Sõnaraamat
Name[fi]=Sanasto
Name[fr]=Dictionnaire
Name[gl]=Dicionario
Name[ia]=Dictionario
Name[id]=Kamus
Name[it]=Dizionario
Name[ko]=

View File

@ -11,6 +11,7 @@ Name[et]=Google
Name[fi]=Google
Name[fr]=Google
Name[gl]=Google
Name[ia]=Google
Name[id]=Google
Name[it]=Google
Name[ko]=Google

View File

@ -11,6 +11,7 @@ Name[et]=Linux
Name[fi]=Linux
Name[fr]=Linux
Name[gl]=Linux
Name[ia]=Linux
Name[id]=Linux
Name[it]=Linux
Name[ko]=

View File

@ -11,6 +11,7 @@ Name[et]=Windows
Name[fi]=Windows
Name[fr]=Windows
Name[gl]=Xanelas
Name[ia]=Fenestras
Name[id]=Windows
Name[it]=Windows
Name[ko]=Windows