Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +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-09-30 05:50:04 +02:00
parent 7c570c93db
commit 853baa8232
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/StatusBarIcons/metadata.desktop
View File

@ -10,7 +10,7 @@ Name[es]=Iconos de la barra de tareas
Name[fi]=Tilarivin kuvakkeet Name[fi]=Tilarivin kuvakkeet
Name[fr]=Icônes de la barre d'état Name[fr]=Icônes de la barre d'état
Name[gl]=Iconas da barra de estado Name[gl]=Iconas da barra de estado
Name[id]=Ikon BilahStatus Name[id]=StatusBar Icons
Name[it]=Icone della barra di stato Name[it]=Icone della barra di stato
Name[nl]=Pictogrammen op de statusbalk Name[nl]=Pictogrammen op de statusbalk
Name[nn]=Statuslinje-ikon Name[nn]=Statuslinje-ikon

2
src/plugins/TabManager/metadata.desktop
View File

@ -10,7 +10,7 @@ Name[es]=Gestor de pestañas
Name[fi]=Välilehtien hallinta Name[fi]=Välilehtien hallinta
Name[fr]=Gestionnaire d'onglets Name[fr]=Gestionnaire d'onglets
Name[gl]=Xestor de lapelas Name[gl]=Xestor de lapelas
Name[id]=Pengelola Tab Name[id]=Tab Manager
Name[it]=Gestore delle schede Name[it]=Gestore delle schede
Name[nl]=Tabbladbeheerder Name[nl]=Tabbladbeheerder
Name[nn]=Fanehandsamar Name[nn]=Fanehandsamar

2
src/plugins/TestPlugin/metadata.desktop
View File

@ -10,7 +10,7 @@ Name[es]=Complemento de ejemplo
Name[fi]=Esimerkkiliitännäinen Name[fi]=Esimerkkiliitännäinen
Name[fr]=Module externe d'exemple Name[fr]=Module externe d'exemple
Name[gl]=Complemento de exemplo Name[gl]=Complemento de exemplo
Name[id]=Contoh Plugin Name[id]=Example Plugin
Name[it]=Estensione di esempio Name[it]=Estensione di esempio
Name[nl]=Voorbeeld plug-in Name[nl]=Voorbeeld plug-in
Name[nn]=Eksempel-tillegg Name[nn]=Eksempel-tillegg

2
src/plugins/VerticalTabs/metadata.desktop
View File

@ -10,7 +10,7 @@ Name[es]=Pestañas verticales
Name[fi]=Pystyvälilehdet Name[fi]=Pystyvälilehdet
Name[fr]=Onglets verticaux Name[fr]=Onglets verticaux
Name[gl]=Lapelas verticais Name[gl]=Lapelas verticais
Name[id]=Tab Tegak Name[id]=Vertical Tabs
Name[it]=Schede verticali Name[it]=Schede verticali
Name[nl]=Verticale tabbladen Name[nl]=Verticale tabbladen
Name[nn]=Loddrette faner Name[nn]=Loddrette faner

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[id]=MiddleClickLoader
Name[it]=Caricatore al clic centrale Name[it]=Caricatore al clic centrale
Name[nl]=MiddleClickLoader Name[nl]=MiddleClickLoader
Name[nn]=Lasting med midtklikk Name[nn]=Lasting med midtklikk
@ -22,6 +23,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[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
Comment[pt]=Carrega o texto na área de transferência como um URL Comment[pt]=Carrega o texto na área de transferência como um URL