diff options
| author | l10n daemon script <scripty@kde.org> | 2015-11-21 19:21:44 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2015-11-21 19:21:44 +0000 |
| commit | 417c7300ef01cc3aa0d11f8e5506d365855019e2 (patch) | |
| tree | c6c0259ed094b1ca5c4b744bc3b1ee02b04bc4b2 | |
| parent | 0f1e67051dae0c9b1f23461f7caed594795e8a27 (diff) | |
| download | kconfig-417c7300ef01cc3aa0d11f8e5506d365855019e2.tar.gz kconfig-417c7300ef01cc3aa0d11f8e5506d365855019e2.tar.bz2 | |
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"
| -rw-r--r-- | src/core/kconfigbackend.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop index 58962065..500088bb 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -5,6 +5,7 @@ X-KDE-ServiceType=KConfigBackend Comment=Storage backend for KConfig Comment[ar]=خلفية الحفظ لـ KConfig Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড +Comment[ast]=Backend d'almacenamientu pa KConfig Comment[be@latin]=Słužba schovišča dla systemy „KConfig” Comment[bg]=Storage backend for KConfig Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড |