diff options
| author | l10n daemon script <scripty@kde.org> | 2016-12-21 05:46:48 +0100 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2016-12-21 05:46:48 +0100 |
| commit | 9d5b64f16243d14e27402be23224f08cd8420bbe (patch) | |
| tree | 4001eb39e3cca737bfb7db6e2ca25a4a7e9a47f8 | |
| parent | f86f153a8050c9337e0f6c7b84171f50474df3b1 (diff) | |
| download | kconfig-9d5b64f16243d14e27402be23224f08cd8420bbe.tar.gz kconfig-9d5b64f16243d14e27402be23224f08cd8420bbe.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 5e85f2b8..37e1b961 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]=سند «ضبطك» للتّخزين 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-এর স্টোরেজ ব্যাকেন্ড |