Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +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-10-23 06:01:07 +02:00
parent 116ba93b79
commit 14f88fb46c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/helloqml/metadata.desktop
View File

@ -4,6 +4,7 @@ Name[ca]=Hola Qml
Name[ca@valencia]=Hola Qml Name[ca@valencia]=Hola Qml
Name[es]=Hola Qml Name[es]=Hola Qml
Name[fr]=Bonjour Qml Name[fr]=Bonjour Qml
Name[gl]=Ola Qml
Name[id]=Hello Qml Name[id]=Hello Qml
Name[nl]=Hello Qml Name[nl]=Hello Qml
Name[pt]=Olá em QML Name[pt]=Olá em QML
@ -15,6 +16,7 @@ Comment[ca]=Connector Qml d'exemple
Comment[ca@valencia]=Connector Qml d'exemple Comment[ca@valencia]=Connector Qml d'exemple
Comment[es]=Complemento de ejemplo de Qml Comment[es]=Complemento de ejemplo de Qml
Comment[fr]=Exemple de module externe Qml Comment[fr]=Exemple de module externe Qml
Comment[gl]=Complemento de exemplo de Qml
Comment[id]=Contoh Plugin Qml Comment[id]=Contoh Plugin Qml
Comment[nl]=Voorbeeld Qml-plug-in Comment[nl]=Voorbeeld Qml-plug-in
Comment[pt]='Plugin' de Exemplo em QML Comment[pt]='Plugin' de Exemplo em QML

2
src/scripts/middleclickloader/metadata.desktop
View File

@ -7,6 +7,7 @@ Name[en_GB]=MiddleClickLoader
Name[es]=Cargador de clic central Name[es]=Cargador de clic central
Name[fi]=Keskipainikelatain Name[fi]=Keskipainikelatain
Name[fr]=MiddleClickLoader Name[fr]=MiddleClickLoader
Name[gl]=MiddleClickLoader
Name[id]=MiddleClickLoader Name[id]=MiddleClickLoader
Name[it]=Caricatore al clic centrale Name[it]=Caricatore al clic centrale
Name[nl]=MiddleClickLoader Name[nl]=MiddleClickLoader
@ -24,6 +25,7 @@ Comment[en_GB]=Load text in selection clipboard as URL
Comment[es]=Cargar texto seleccionado en el portapapeles como URL Comment[es]=Cargar texto seleccionado en el portapapeles como URL
Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi
Comment[fr]=Charger l'URL sélectionnée dans le presse-papier Comment[fr]=Charger l'URL sélectionnée dans le presse-papier
Comment[gl]=Cargar texto no portapapeis de selección como URL
Comment[id]=Muat teks dalam seleksi clipboard sebagai URL Comment[id]=Muat teks dalam seleksi clipboard sebagai URL
Comment[it]=Carica come URL il testo negli appunti della selezione Comment[it]=Carica come URL il testo negli appunti della selezione
Comment[nl]=Tekst laden in selectieklembord als URL Comment[nl]=Tekst laden in selectieklembord als URL