diff options
| author | l10n daemon script <[email protected]> | 2023-11-04 12:00:15 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-04 12:00:15 +0000 |
| commit | d1f4e8d1e79814f6ddf56e56c7d121c9f1838b4e (patch) | |
| tree | 0c23f56ad01ed6170514a2eae23a41d90e715ccf /src/settings/kcm/kcmdolphingeneral.json | |
| parent | 6403ce27ccd4ec420735d0348fdb603d69a2dd7b (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/kcmdolphingeneral.json')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index 57fcaa3da..27db6ba17 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -42,7 +42,6 @@ "Name[tr]": "Genel", "Name[uk]": "Загальне", "Name[vi]": "Chung", - "Name[x-test]": "xxGeneralxx", "Name[zh_CN]": "常规", "Name[zh_TW]": "一般" }, |