diff --git a/assets/locales/en.json b/assets/locales/en.json index 5154be499..d37a063e9 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -2192,8 +2192,11 @@ "thread.select_size": "Select size", "timeline.delete_after_marker_one": "Delete 1 Feature After History Marker", "timeline.delete_after_marker_other": "Delete {count} Features After History Marker", + "timeline.delete_folders_tip": "Keep their features and nested folders in the history", "timeline.delete_many": "Delete {count} Selected Features", + "timeline.feature_error": "Error: {message}", "timeline.feature_hint": "Double-click to edit · drag to reorder · right-click for more", + "timeline.feature_warning": "Warning: {message}", "timeline.group": "New Feature Folder", "timeline.move_many": "Move Timeline Items", "timeline.move_to_group": "Move Features to Folder", diff --git a/assets/locales/es.json b/assets/locales/es.json index bc5e47a62..485ee3029 100644 --- a/assets/locales/es.json +++ b/assets/locales/es.json @@ -1759,6 +1759,9 @@ "thread.designation": "Designación", "thread.iso_metric": "Métrica ISO", "thread.select_size": "Seleccionar tamaño", + "timeline.delete_folders_tip": "Conservar sus operaciones y carpetas anidadas en el historial", + "timeline.feature_error": "Error: {message}", + "timeline.feature_warning": "Advertencia: {message}", "timeline.group": "Nueva carpeta de operaciones", "timeline.move_many": "Mover elementos de la línea de tiempo", "timeline.move_to_group": "Mover operaciones a la carpeta", @@ -2343,6 +2346,7 @@ "ui.history_first": "Ir al principio", "ui.history_forward": "Avanzar un paso", "ui.history_last": "Ir al final", + "ui.history_marker_tip": "Marcador del historial: arrastra para retroceder el modelo; las nuevas operaciones se insertan aquí", "ui.history_title": "Historial", "ui.hole": "Agujero", "ui.hole_tap_type": "Tipo de roscado del agujero", diff --git a/assets/locales/ja.json b/assets/locales/ja.json index a5058f907..3c484a75e 100644 --- a/assets/locales/ja.json +++ b/assets/locales/ja.json @@ -2192,8 +2192,11 @@ "thread.select_size": "サイズを選択", "timeline.delete_after_marker_one": "履歴マーカー以降の 1 個のフィーチャーを削除", "timeline.delete_after_marker_other": "履歴マーカー以降の {count} 個のフィーチャーを削除", + "timeline.delete_folders_tip": "フィーチャーと入れ子のフォルダーを履歴に残します", "timeline.delete_many": "選択した {count} 個のフィーチャーを削除", + "timeline.feature_error": "エラー: {message}", "timeline.feature_hint": "ダブルクリックで編集 · ドラッグで並べ替え · 右クリックでその他の操作", + "timeline.feature_warning": "警告: {message}", "timeline.group": "フィーチャーフォルダを新規作成", "timeline.move_many": "タイムライン項目を移動", "timeline.move_to_group": "フィーチャーをフォルダへ移動", diff --git a/assets/locales/pending/history-tooltips.json b/assets/locales/pending/history-tooltips.json deleted file mode 100644 index 6133eed56..000000000 --- a/assets/locales/pending/history-tooltips.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "en": { - "timeline.delete_folders_tip": "Keep their features and nested folders in the history", - "timeline.feature_error": "Error: {message}", - "timeline.feature_warning": "Warning: {message}" - }, - "es": { - "timeline.delete_folders_tip": "Conservar sus operaciones y carpetas anidadas en el historial", - "timeline.feature_error": "Error: {message}", - "timeline.feature_warning": "Advertencia: {message}", - "ui.history_marker_tip": "Marcador del historial: arrastra para retroceder el modelo; las nuevas operaciones se insertan aquí" - }, - "ja": { - "timeline.delete_folders_tip": "フィーチャーと入れ子のフォルダーを履歴に残します", - "timeline.feature_error": "エラー: {message}", - "timeline.feature_warning": "警告: {message}" - }, - "zh": { - "timeline.delete_folders_tip": "在历史记录中保留其中的特征和嵌套文件夹", - "timeline.feature_error": "错误:{message}", - "timeline.feature_warning": "警告:{message}" - } -} diff --git a/assets/locales/zh.json b/assets/locales/zh.json index b393624b6..180f481e5 100644 --- a/assets/locales/zh.json +++ b/assets/locales/zh.json @@ -2192,8 +2192,11 @@ "thread.select_size": "选择尺寸", "timeline.delete_after_marker_one": "删除历史标记之后的 1 个特征", "timeline.delete_after_marker_other": "删除历史标记之后的 {count} 个特征", + "timeline.delete_folders_tip": "在历史记录中保留其中的特征和嵌套文件夹", "timeline.delete_many": "删除所选的 {count} 个特征", + "timeline.feature_error": "错误:{message}", "timeline.feature_hint": "双击编辑 · 拖动以重新排序 · 右键查看更多操作", + "timeline.feature_warning": "警告:{message}", "timeline.group": "新建特征文件夹", "timeline.move_many": "移动时间线项目", "timeline.move_to_group": "将特征移至文件夹",