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-04-18 07:35:32 +02:00
parent a62fb97ed8
commit 1b065536b0
6 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/AutoScroll/metadata.desktop
View File

@ -3,6 +3,7 @@ Name=AutoScroll
Name[ca]=Desplaçament automàtic Name[ca]=Desplaçament automàtic
Name[ca@valencia]=Desplaçament automàtic Name[ca@valencia]=Desplaçament automàtic
Name[cs]=Automatické posouvání Name[cs]=Automatické posouvání
Name[de]=Automatischer Bildlauf
Name[en_GB]=AutoScroll Name[en_GB]=AutoScroll
Name[es]=Desplazamiento automático Name[es]=Desplazamiento automático
Name[fi]=Automaattivieritys Name[fi]=Automaattivieritys

1
src/plugins/FlashCookieManager/metadata.desktop
View File

@ -3,6 +3,7 @@ Name=Flash Cookie Manager
Name[ca]=Gestor de galetes Flash Name[ca]=Gestor de galetes Flash
Name[ca@valencia]=Gestor de galetes Flash Name[ca@valencia]=Gestor de galetes Flash
Name[cs]=Správce cookies pro Flash Name[cs]=Správce cookies pro Flash
Name[de]=Flash-Cookie-Verwaltung
Name[en_GB]=Flash Cookie Manager Name[en_GB]=Flash Cookie Manager
Name[es]=Gestor de cookies de Flash Name[es]=Gestor de cookies de Flash
Name[fi]=Flash-evästeiden hallinta Name[fi]=Flash-evästeiden hallinta

1
src/plugins/ImageFinder/metadata.desktop
View File

@ -2,6 +2,7 @@
Name=ImageFinder Name=ImageFinder
Name[ca]=ImageFinder Name[ca]=ImageFinder
Name[ca@valencia]=ImageFinder Name[ca@valencia]=ImageFinder
Name[de]=Bildersuche
Name[en_GB]=ImageFinder Name[en_GB]=ImageFinder
Name[es]=Buscador de imágenes Name[es]=Buscador de imágenes
Name[fi]=ImageFinder Name[fi]=ImageFinder

1
src/plugins/KWalletPasswords/metadata.desktop
View File

@ -2,6 +2,7 @@
Name=KWallet Passwords Name=KWallet Passwords
Name[ca]=Contrasenyes del KWallet Name[ca]=Contrasenyes del KWallet
Name[ca@valencia]=Contrasenyes del KWallet Name[ca@valencia]=Contrasenyes del KWallet
Name[de]=KWallet-Passwörter
Name[en_GB]=KWallet Passwords Name[en_GB]=KWallet Passwords
Name[es]=Contraseñas de KWallet Name[es]=Contraseñas de KWallet
Name[fi]=KWallet-salasanat Name[fi]=KWallet-salasanat

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

@ -3,6 +3,7 @@ Name=Example Plugin
Name[ca]=Connector d'exemple Name[ca]=Connector d'exemple
Name[ca@valencia]=Connector d'exemple Name[ca@valencia]=Connector d'exemple
Name[cs]=Ukázkový modul Name[cs]=Ukázkový modul
Name[de]=Beispielmodul
Name[en_GB]=Example Plugin Name[en_GB]=Example Plugin
Name[es]=Complemento de ejemplo Name[es]=Complemento de ejemplo
Name[fi]=Esimerkkiliitännäinen Name[fi]=Esimerkkiliitännäinen

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

@ -3,6 +3,7 @@ Name=Vertical Tabs
Name[ca]=Pestanyes verticals Name[ca]=Pestanyes verticals
Name[ca@valencia]=Pestanyes verticals Name[ca@valencia]=Pestanyes verticals
Name[cs]=Svislé karty Name[cs]=Svislé karty
Name[de]=Senkrechte Unterfenster
Name[en_GB]=Vertical Tabs Name[en_GB]=Vertical Tabs
Name[es]=Pestañas verticales Name[es]=Pestañas verticales
Name[fi]=Pystyvälilehdet Name[fi]=Pystyvälilehdet