Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +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-11-17 05:55:31 +01:00
parent 5614914d14
commit 9e56be5194
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ Comment[ca]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KW
Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet
Comment[cs]=Poskytuje podporu pro KIO a ukládání hesel v Kwallet Comment[cs]=Poskytuje podporu pro KIO a ukládání hesel v Kwallet
Comment[da]=Giver understøttelse af KIO og lagring af adgangskoder i KWallet Comment[da]=Giver understøttelse af KIO og lagring af adgangskoder i KWallet
Comment[de]=Unterstützung für KIO und die Speicherung von Passwörtern in KWallet
Comment[en_GB]=Provides support for KIO and storing passwords in KWallet Comment[en_GB]=Provides support for KIO and storing passwords in KWallet
Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet
Comment[fi]=Tarjoaa KIO-tuen sekä salasanojen tallentamisen KWalletiin Comment[fi]=Tarjoaa KIO-tuen sekä salasanojen tallentamisen KWalletiin

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

@ -2,6 +2,7 @@
Name=Hello Qml Name=Hello Qml
Name[ca]=Hola Qml Name[ca]=Hola Qml
Name[ca@valencia]=Hola Qml Name[ca@valencia]=Hola Qml
Name[de]=Hallo Qml
Name[en_GB]=Hello QML Name[en_GB]=Hello QML
Name[es]=Hola Qml Name[es]=Hola Qml
Name[fr]=Bonjour Qml Name[fr]=Bonjour Qml
@ -16,6 +17,7 @@ Name[x-test]=xxHello Qmlxx
Comment=Sample Qml Plugin Comment=Sample Qml Plugin
Comment[ca]=Connector Qml d'exemple Comment[ca]=Connector Qml d'exemple
Comment[ca@valencia]=Connector Qml d'exemple Comment[ca@valencia]=Connector Qml d'exemple
Comment[de]=Beispielmodul in Qml
Comment[en_GB]=Sample QML Plugin Comment[en_GB]=Sample QML Plugin
Comment[es]=Complemento de ejemplo de Qml Comment[es]=Complemento de ejemplo de Qml
Comment[fr]=Exemple de module externe Qml Comment[fr]=Exemple de module externe Qml