diff options
| author | l10n daemon script <[email protected]> | 2023-11-07 03:15:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-11-07 03:15:28 +0000 |
| commit | d558c9a5dd8082488ea884feece22c1add1ea6cd (patch) | |
| tree | 4d6e0d79627ace2f475fad8d9b92cb8b5a356dc2 /src/dolphinpart.json.in | |
| parent | 5644e08579963e63443a3d62d44b885b992c35b3 (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/dolphinpart.json.in')
| -rw-r--r-- | src/dolphinpart.json.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 7f5ad8440..e8c87b8f2 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -60,6 +60,7 @@ "Name[tr]": "Dolphin Görünümü", "Name[uk]": "Перегляд Dolphin", "Name[vi]": "Khung xem Dolphin", + "Name[x-test]": "xxDolphin Viewxx", "Name[zh_CN]": "Dolphin 视图", "Name[zh_TW]": "Dolphin 檢視", "ServiceTypes": [ |