Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +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-05-29 07:28:55 +02:00
parent 7c07af64fe
commit 5ba2dce127
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

@ -3,6 +3,7 @@ Name=ImageFinder
Name[ca]=ImageFinder
Name[ca@valencia]=ImageFinder
Name[cs]=ImageFinder
Name[da]=ImageFinder
Name[de]=Bildersuche
Name[en_GB]=ImageFinder
Name[es]=Buscador de imágenes
@ -19,6 +20,7 @@ Comment=Provides context menu with reverse image search engine support
Comment[ca]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges
Comment[ca@valencia]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges
Comment[cs]=Poskytuje kontextovou nabídku pro nástroj pro vyhledávání obrázků
Comment[da]=Giver genvejsmenu med understøttelse af omvendt billedsøgetjeneste
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[fi]=Tarjoaa kontekstivalikon käänteisen kuvahaun tuen moottorille

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

@ -3,6 +3,7 @@ Name=KWallet Passwords
Name[ca]=Contrasenyes del KWallet
Name[ca@valencia]=Contrasenyes del KWallet
Name[cs]=Hesla Kwallet
Name[da]=Adgangskoder til KWallet
Name[de]=KWallet-Passwörter
Name[en_GB]=KWallet Passwords
Name[es]=Contraseñas de KWallet
@ -19,6 +20,7 @@ Comment=Provides support for storing passwords in KWallet
Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet
Comment[ca@valencia]=Proporciona suport per emmagatzemar contrasenyes al KWallet
Comment[cs]=Poskytuje podporu pro ukládání hesel v Kwallet
Comment[da]=Giver understøttelse til lagring af adgangskoder i KWallet
Comment[en_GB]=Provides support for storing passwords in KWallet
Comment[es]=Implementa el almacenamiento de contraseñas en KWallet
Comment[id]=Menyediakan dukungan untuk menyimpan sandi dalam KWallet