mirror of
https://invent.kde.org/network/falkon.git
synced 2024-09-21 17:52:10 +02: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
ea6ca453ab
commit
b1dc68d09e
|
@ -1,5 +1,8 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=KDE Frameworks Integration
|
Name=KDE Frameworks Integration
|
||||||
|
Name[ca]=Integració amb els Frameworks del KDE
|
||||||
|
Name[nl]=KDE Frameworks integratie
|
||||||
|
Name[x-test]=xxKDE Frameworks Integrationxx
|
||||||
Comment=Provides support for KIO and storing passwords in KWallet
|
Comment=Provides support for KIO and storing passwords in KWallet
|
||||||
Comment[ca]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
|
Comment[ca]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
|
||||||
Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
|
Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes al KWallet
|
||||||
|
|
Loading…
Reference in New Issue
Block a user