diff options
| author | l10n daemon script <[email protected]> | 2026-06-16 01:42:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-06-16 01:42:55 +0000 |
| commit | 25999b25f6b9ef87aa26013c57f72dd4e25b97b9 (patch) | |
| tree | 2dee64e9c449bfd69a4307878cbef9734c1f6ab9 /src/settings/kcm | |
| parent | eabed6e1f1d0aa9e25fc73f540250232ec9edc55 (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 c3ed3212b..5fd1de0e6 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -32,6 +32,7 @@ "Name[ja]": "全般", "Name[ka]": "მთავარი", "Name[ko]": "일반", + "Name[lo]": "ທົ່ວໄປ", "Name[lt]": "Bendrosios", "Name[lv]": "Vispārīgi", "Name[nb]": "Generelt", diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 8eab5147b..434b49a7f 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -32,6 +32,7 @@ "Name[ja]": "表示モード", "Name[ka]": "ნახვის რეჟიმები", "Name[ko]": "보기 모드", + "Name[lo]": "ໂຫມດມຸມມອງ", "Name[lt]": "Rodinio veiksenos", "Name[lv]": "Skata režīmi", "Name[ml]": "അവതരണ രീതികള്", |