diff options
| author | l10n daemon script <scripty@kde.org> | 2020-07-14 05:53:21 +0200 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2020-07-14 05:53:21 +0200 |
| commit | 538cf784734434e5478f7b3dab8af131304dd656 (patch) | |
| tree | 32ff222d2075f659ef169965db2399b2cdb858a5 | |
| parent | 2f7207fcaa9b228a777fd82908dbf28b9a32d090 (diff) | |
| download | kconfig-538cf784734434e5478f7b3dab8af131304dd656.tar.gz kconfig-538cf784734434e5478f7b3dab8af131304dd656.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 56702e15..496eb7b4 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -11,7 +11,7 @@ Comment[bg]=Storage backend for KConfig Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড Comment[bn_IN]=KConfig-র জন্য ব্যবহৃত ব্যাক-এন্ড সংগ্রহস্থল Comment[bs]=Skladišna pozadina za K‑konfig -Comment[ca]=Dorsal d'emmagatzematge pel KConfig +Comment[ca]=Dorsal de l'emmagatzematge per al KConfig Comment[ca@valencia]=Dorsal d'emmagatzematge pel KConfig Comment[cs]=Úložiště pro KConfig Comment[csb]=Zôpisownô zbiérnica dlô KConfig |