diff options
| author | l10n daemon script <[email protected]> | 2024-01-17 01:13:46 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-01-17 01:13:46 +0000 |
| commit | 18cd42837f746984ae603513995c07fac8636b75 (patch) | |
| tree | a4a553d4e6de04a787cc5f1dcf0acb87a074ac4b /src/settings | |
| parent | 3a25f7628cf51dc1314adf4086f69baa8b6c7952 (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')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 5c15b5a71..975e181b7 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -30,6 +30,7 @@ "Name[ka]": "მთავარი", "Name[ko]": "일반", "Name[lt]": "Bendrosios", + "Name[lv]": "Vispārīgi", "Name[nb]": "Generelt", "Name[nl]": "Algemeen", "Name[nn]": "Generelt", |