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 2019-05-25 08:42:22 +02:00
parent 3075477492
commit cc248c72c8
2 changed files with 2 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=Provides support for KIO and storing passwords in KWallet
Comment[ca]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet Comment[ca]=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[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[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

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

@ -24,6 +24,7 @@ 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[cs]=Ukázkový modul QML Comment[cs]=Ukázkový modul QML
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[fi]=Esimerkki-QML-liitännäinen Comment[fi]=Esimerkki-QML-liitännäinen