diff options
| author | l10n daemon script <[email protected]> | 2026-06-03 02:24:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-06-03 02:24:32 +0000 |
| commit | fe6bb8bd6a076d8293e2090935ee41577324c760 (patch) | |
| tree | cfa9456ee7a785ce1c532454029ec54b31c48f8c /src/settings/kcm | |
| parent | e402e1211cae466c7ba906dcb9e6337cd33d63bc (diff) | |
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"
Diffstat (limited to 'src/settings/kcm')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index a1254bdda..c3ed3212b 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -49,6 +49,7 @@ "Name[sv]": "Allmänt", "Name[ta]": "பொதுவானவை", "Name[tr]": "Genel", + "Name[ug]": "ئادەتتىكى", "Name[uk]": "Загальне", "Name[vi]": "Chung", "Name[zh_CN]": "常规", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 11ff10228..8eab5147b 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -56,6 +56,7 @@ "Name[sv]": "Visningslägen", "Name[ta]": "காட்சிமுறைகள்", "Name[tr]": "Görünüm Kipleri", + "Name[ug]": "كۆرۈنۈش ھالىتى", "Name[uk]": "Режими перегляду", "Name[vi]": "Các chế độ xem", "Name[zh_CN]": "视图模式", |