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:
parent
9dd9e24e10
commit
46bed4a478
@ -1,6 +1,18 @@
|
||||
[Desktop Entry]
|
||||
Name=KDE Support
|
||||
Name[ca]=Suport pel KDE
|
||||
Name[en_GB]=KDE Support
|
||||
Name[nl]=KDE ondersteuning
|
||||
Name[pt]=Suporte ao KDE
|
||||
Name[uk]=Підтримка KDE
|
||||
Name[x-test]=xxKDE Supportxx
|
||||
Comment=Provides support for KIO and storing passwords in KWallet
|
||||
Comment[ca]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
|
||||
Comment[en_GB]=Provides support for KIO and storing passwords in KWallet
|
||||
Comment[nl]=Biedt ondersteuning voor KIO en opslaan van wachtwoorden in KWallet
|
||||
Comment[pt]=Oferece o suporte para o KIO e para guardar as senhas no KWallet
|
||||
Comment[uk]=Забезпечує підтримку засобів введення-виведення KIO і зберігання паролів у KWallet
|
||||
Comment[x-test]=xxProvides support for KIO and storing passwords in KWalletxx
|
||||
|
||||
Icon=:kdesupport/data/icon.svg
|
||||
Type=Service
|
||||
|
Loading…
Reference in New Issue
Block a user