diff options
| author | l10n daemon script <[email protected]> | 2025-09-09 02:12:34 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-09 02:12:34 +0000 |
| commit | d22a837edd132b29535810c01aacfcc1a004c10a (patch) | |
| tree | 696ae5758e9446bade8894e6f615c0de792c5d24 | |
| parent | 2644ac445f28322bd1e66c9f87b80e735dd1c8cb (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"
| -rw-r--r-- | src/dolphinpart.json.in | 1 | ||||
| -rw-r--r-- | src/itemactions/movetonewfolderitemaction.json | 1 | ||||
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 87489f09e..4537f88a0 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -68,7 +68,6 @@ "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 檢視", "Version": "@DOLPHIN_VERSION@" diff --git a/src/itemactions/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json index aa6251d6c..3b995afa8 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -45,7 +45,6 @@ "Name[ta]": "புதிய அடைவிற்கு நகர்த்து", "Name[tr]": "Yeni Klasöre Taşı", "Name[uk]": "Пересунути до нової теки", - "Name[x-test]": "xxMove to New Folderxx", "Name[zh_CN]": "移动到新建文件夹", "Name[zh_TW]": "移動到新資料夾" }, diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index ac7e333ac..b12e1eba2 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -30,7 +30,6 @@ "Name[sv]": "Ange katalogikon", "Name[tr]": "Klasör Simgesi Ayarla", "Name[uk]": "Встановити піктограму теки", - "Name[x-test]": "xxSet Folder Iconxx", "Name[zh_CN]": "设置文件夹图标", "Name[zh_TW]": "設定資料夾圖示" }, diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index eec426486..36b99c7d7 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -49,7 +49,6 @@ "Name[tr]": "Genel", "Name[uk]": "Загальне", "Name[vi]": "Chung", - "Name[x-test]": "xxGeneralxx", "Name[zh_CN]": "常规", "Name[zh_TW]": "一般" }, diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 4af7e5b2b..2c72ff866 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -57,7 +57,6 @@ "Name[tr]": "Görünüm Kipleri", "Name[uk]": "Режими перегляду", "Name[vi]": "Các chế độ xem", - "Name[x-test]": "xxView Modesxx", "Name[zh_CN]": "视图模式", "Name[zh_TW]": "檢視模式" }, |