diff options
| author | l10n daemon script <scripty@kde.org> | 2018-04-06 05:23:56 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2018-04-06 05:23:56 +0200 |
| commit | 9c8785b130b13573229f3791f8165200f9e2c037 (patch) | |
| tree | 1d289837f0ae17b9bed86721c46b504687fabee3 | |
| parent | 6cfd982a582961f8b5b44ac13f720a850d2544bc (diff) | |
| download | kconfig-9c8785b130b13573229f3791f8165200f9e2c037.tar.gz kconfig-9c8785b130b13573229f3791f8165200f9e2c037.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/kconfigbackend.desktop b/src/core/kconfigbackend.desktop index 081f1da0..e3bb6e9e 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -39,7 +39,7 @@ Comment[hy]=Բահեստի հետևի մասը KConfig-ի համար Comment[ia]=Retro-administration de immagazinage (storage) pro Kconfig Comment[id]=Backend penyimpanan untuk KConfig Comment[is]=Geymslubakendi fyrir KConfig -Comment[it]=Backend di archiviazione per KConfig +Comment[it]=Motore di archiviazione per KConfig Comment[ja]=KConfig のストレージバックエンド Comment[kk]=KConfig үшін сақтау тетігі Comment[km]=កម្មវិធីខាងក្រោយការផ្ទុកសម្រាប់ KConfig |