diff options
| author | l10n daemon script <scripty@kde.org> | 2018-08-26 05:37:52 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2018-08-26 05:37:52 +0200 |
| commit | ae1da3f99e349619143ac3cdb3e0d91b84e3efab (patch) | |
| tree | da8f1bf975651163fa08350e10c17ab1b85c6e02 | |
| parent | 1bf473224a0b8c762c3fc87f0560421023c3f27e (diff) | |
| download | kconfig-ae1da3f99e349619143ac3cdb3e0d91b84e3efab.tar.gz kconfig-ae1da3f99e349619143ac3cdb3e0d91b84e3efab.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 e3bb6e9e..9c21cb2a 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]=سند «ضبطك» للتّخزين +Comment[ar]=سند «ضبطك» للتخزين Comment[as]=KConfig ৰ বাবে ভঁৰালৰ বেকএন্ড Comment[ast]=Backend d'almacenamientu pa KConfig Comment[be@latin]=Słužba schovišča dla systemy „KConfig” |