diff options
| author | l10n daemon script <[email protected]> | 2025-09-25 01:35:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-25 01:35:17 +0000 |
| commit | 0778b805cd823172f179809f535048c41bccef8d (patch) | |
| tree | 1a9cc482825dfb633ab1e7107f03da8b26432031 /src/settings/kcm | |
| parent | eb94e6dd675da09f1d8979be42ced179ec853a23 (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 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 36b99c7d7..8c743d781 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -28,6 +28,7 @@ "Name[ie]": "General", "Name[is]": "Almennt", "Name[it]": "Generale", + "Name[ja]": "全般", "Name[ka]": "მთავარი", "Name[ko]": "일반", "Name[lt]": "Bendrosios", |