diff options
| author | l10n daemon script <scripty@kde.org> | 2016-01-20 12:41:24 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2016-01-20 12:41:24 +0000 |
| commit | 2639e721ee40817a731f551f4d27a475db073245 (patch) | |
| tree | 2bce552f98aa3bf9546db3ce90a4c2265d995456 | |
| parent | 83fbb89d727d897f3c9e720efc1dc8eb21639cb1 (diff) | |
| download | kconfig-2639e721ee40817a731f551f4d27a475db073245.tar.gz kconfig-2639e721ee40817a731f551f4d27a475db073245.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 500088bb..37e1b961 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -3,7 +3,7 @@ Type=ServiceType X-KDE-ServiceType=KConfigBackend Comment=Storage backend for KConfig -Comment[ar]=خلفية الحفظ لـ KConfig +Comment[ar]=سند «ضبطك» للتّخزين Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড Comment[ast]=Backend d'almacenamientu pa KConfig Comment[be@latin]=Słužba schovišča dla systemy „KConfig” |