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-07-26 05:43:51 +02:00
parent d5fc3ebc88
commit 10574667b1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
Name=MiddleClickLoader Name=MiddleClickLoader
Name[ca]=MiddleClickLoader Name[ca]=MiddleClickLoader
Name[ca@valencia]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader
Name[cs]=Načtení prostředním tlačítkem myši
Name[es]=Cargador de clic central Name[es]=Cargador de clic central
Name[fr]=MiddleClickLoader Name[fr]=MiddleClickLoader
Name[it]=Caricatore al clic centrale Name[it]=Caricatore al clic centrale
@ -13,6 +14,7 @@ Name[x-test]=xxMiddleClickLoaderxx
Comment=Load text in selection clipboard as URL Comment=Load text in selection clipboard as URL
Comment[ca]=Carrega text com a URL en una selecció del porta-retalls 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[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[fr]=Charger l'URL sélectionnée dans le presse-papier Comment[fr]=Charger l'URL sélectionnée dans le presse-papier
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