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-12-17 08:00:20 +01:00
parent 3472ff713d
commit b9f1083370
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/plugins/ImageFinder/metadata.desktop
View File

@ -9,6 +9,7 @@ Name[en_GB]=ImageFinder
Name[es]=Buscador de imágenes Name[es]=Buscador de imágenes
Name[fi]=ImageFinder Name[fi]=ImageFinder
Name[fr]=ImageFinder Name[fr]=ImageFinder
Name[gl]=ImageFinder
Name[id]=ImageFinder Name[id]=ImageFinder
Name[it]=Cercatore di immagini Name[it]=Cercatore di immagini
Name[nl]=ImageFinder Name[nl]=ImageFinder
@ -31,6 +32,7 @@ Comment[en_GB]=Provides context menu with reverse image search engine support
Comment[es]=Proporciona un menú de contexto con implementación de búsqueda inversa de imágenes Comment[es]=Proporciona un menú de contexto con implementación de búsqueda inversa de imágenes
Comment[fi]=Tarjoaa kontekstivalikon käänteisen kuvahaun tuen moottorille Comment[fi]=Tarjoaa kontekstivalikon käänteisen kuvahaun tuen moottorille
Comment[fr]=Prise en charge de menu contextuels de recherche d'image inversée Comment[fr]=Prise en charge de menu contextuels de recherche d'image inversée
Comment[gl]=Fornece un menú contextual cun motor de busca inversa de imaxes
Comment[id]=Menyediakan menu konteks dengan dukungan mesin pencari gambar terbalik Comment[id]=Menyediakan menu konteks dengan dukungan mesin pencari gambar terbalik
Comment[it]=Fornisce un menu contestuale con un supporto al motore di ricerca inversa di immagini Comment[it]=Fornisce un menu contestuale con un supporto al motore di ricerca inversa di immagini
Comment[nl]=Biedt contextmenu met ondersteuningsengine voor omgekeerd afbeeldingen zoeken Comment[nl]=Biedt contextmenu met ondersteuningsengine voor omgekeerd afbeeldingen zoeken

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

@ -9,6 +9,7 @@ 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
Name[fr]=Mots de passe KWallet Name[fr]=Mots de passe KWallet
Name[gl]=Contrasinais de KWallet
Name[id]=KWallet Passwords Name[id]=KWallet Passwords
Name[it]=Password di KWallet Name[it]=Password di KWallet
Name[nl]=Wachtwoorden in KWallet Name[nl]=Wachtwoorden in KWallet
@ -31,6 +32,7 @@ Comment[en_GB]=Provides support for storing passwords in KWallet
Comment[es]=Implementa el almacenamiento de contraseñas en KWallet Comment[es]=Implementa el almacenamiento de contraseñas en KWallet
Comment[fi]=Tarjoaa tuen salasanojen tallentamiseksi KWalletiin Comment[fi]=Tarjoaa tuen salasanojen tallentamiseksi KWalletiin
Comment[fr]=Prise en charge du stockage de mots de passe dans KWallet Comment[fr]=Prise en charge du stockage de mots de passe dans KWallet
Comment[gl]=Permite almacenar contrasinais en KWallet
Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam KWallet Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam KWallet
Comment[it]=Fornisce un supporto per l'immagazzinamento delle password in KWallet Comment[it]=Fornisce un supporto per l'immagazzinamento delle password in KWallet
Comment[nl]=Biedt ondersteuning voor opslaan van wachtwoorden in KWallet Comment[nl]=Biedt ondersteuning voor opslaan van wachtwoorden in KWallet