diff options
| author | l10n daemon script <scripty@kde.org> | 2015-11-04 17:04:03 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2015-11-04 17:04:03 +0000 |
| commit | 12399c3558a124bb3ba7e782842889c50043454d (patch) | |
| tree | d92dec183df718bf3f42a77b52cd54e3c8e78f6c | |
| parent | 19513e1910f19375a4c17a61f048c7f8c2f9e840 (diff) | |
| download | kconfig-12399c3558a124bb3ba7e782842889c50043454d.tar.gz kconfig-12399c3558a124bb3ba7e782842889c50043454d.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 5aaf5aa0..58962065 100644 --- a/src/core/kconfigbackend.desktop +++ b/src/core/kconfigbackend.desktop @@ -11,7 +11,7 @@ Comment[bn]=KConfig-এর স্টোরেজ ব্যাকেন্ড Comment[bn_IN]=KConfig-র জন্য ব্যবহৃত ব্যাক-এন্ড সংগ্রহস্থল Comment[bs]=Skladišna pozadina za K‑konfig Comment[ca]=Dorsal d'emmagatzematge pel KConfig -Comment[ca@valencia]=Dorsal d'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 Comment[da]=Lagringsmotor til KConfig |