1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

SVN_SILENT made messages (.desktop file) - always resolve ours

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-09 07:08:34 +02:00
parent a703947e87
commit ba16c67115

View File

@ -11,7 +11,11 @@ Name[uk]=Паролі KWallet
Name[x-test]=xxKWallet Passwordsxx
Comment=Provides support for storing passwords in KWallet
Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet
Comment[en_GB]=Provides support for storing passwords 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[sv]=Tillhandahåller stöd för att lagra lösenord i plånboken
Comment[uk]=Забезпечує підтримку зберігання паролів у KWallet
Comment[x-test]=xxProvides support for storing passwords in KWalletxx
Icon=:kwp/data/icon.png