diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs index a846f76cc..4b0c3107e 100644 --- a/ShareX.HelpersLib/Properties/Resources.Designer.cs +++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs @@ -373,6 +373,42 @@ internal static string CssFileNameEditor_EditValue_Browse_for_a_Cascading_Style_ } } + /// + /// Looks up a localized string similar to File uploader. + /// + internal static string CustomUploaderDestinationType_FileUploader { + get { + return ResourceManager.GetString("CustomUploaderDestinationType_FileUploader", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Image uploader. + /// + internal static string CustomUploaderDestinationType_ImageUploader { + get { + return ResourceManager.GetString("CustomUploaderDestinationType_ImageUploader", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Text uploader. + /// + internal static string CustomUploaderDestinationType_TextUploader { + get { + return ResourceManager.GetString("CustomUploaderDestinationType_TextUploader", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to URL shortener. + /// + internal static string CustomUploaderDestinationType_URLShortener { + get { + return ResourceManager.GetString("CustomUploaderDestinationType_URLShortener", resourceCulture); + } + } + /// /// Looks up a localized string similar to Browse for a folder.... /// @@ -2704,6 +2740,15 @@ internal static string URLSharingServices_Email { } } + /// + /// Looks up a localized string similar to Google image search. + /// + internal static string URLSharingServices_GoogleImageSearch { + get { + return ResourceManager.GetString("URLSharingServices_GoogleImageSearch", resourceCulture); + } + } + /// /// Looks up a localized string similar to Custom URL shortener. /// diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx index f8f1bc9f6..98434e5d4 100644 --- a/ShareX.HelpersLib/Properties/Resources.resx +++ b/ShareX.HelpersLib/Properties/Resources.resx @@ -1001,4 +1001,19 @@ Would you like to download it? Drawing: Image (Screen) + + Google image search + + + URL shortener + + + File uploader + + + Text uploader + + + Image uploader + \ No newline at end of file diff --git a/ShareX.HelpersLib/Properties/Resources.ru.resx b/ShareX.HelpersLib/Properties/Resources.ru.resx index 2707caff1..584f66d88 100644 --- a/ShareX.HelpersLib/Properties/Resources.ru.resx +++ b/ShareX.HelpersLib/Properties/Resources.ru.resx @@ -979,4 +979,19 @@ Кадрировать + + Поиск по картинке в Google + + + Сервис коротких ссылок + + + Файловый сервис + + + Сервис текстов + + + Сервис картинок + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs index c04e4a999..c133f5a88 100644 --- a/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs @@ -730,7 +730,7 @@ private void WriteTips(StringBuilder sb) else { sb.AppendLine(Resources.RectangleRegion_WriteTips__Hold_Left_click__Start_region_selection); - sb.AppendLine("[Right click] Cancel capture / remove region"); + sb.AppendLine(Resources.RegionCaptureForm_WriteTips_RightClickCancelCaptureRemoveRegion); } sb.AppendLine(Resources.RectangleRegion_WriteTips__Esc__Cancel_capture); @@ -745,8 +745,8 @@ private void WriteTips(StringBuilder sb) if ((!Config.QuickCrop || !ShapeManager.IsCurrentShapeTypeRegion) && ShapeManager.CurrentShape != null && !ShapeManager.IsCreating) { sb.AppendLine(Resources.RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region); - sb.AppendLine("[Arrow keys] Resize region from bottom right corner"); - sb.AppendLine("[Hold Alt + Arrow keys] Resize region from top left corner"); + sb.AppendLine(Resources.RegionCaptureForm_WriteTips_ArrowKeysResizeRegionFromBottomRightCorner); + sb.AppendLine(Resources.RegionCaptureForm_WriteTips_HoldAltArrowKeysResizeRegionFromTopLeftCorner); sb.AppendLine(Resources.RectangleRegionForm_WriteTips__Hold_Ctrl___Arrow_keys__Move_region); sb.AppendLine(Resources.RectangleRegionForm_WriteTips__Hold_Shift___Arrow_keys__Resize_or_move_region_faster); sb.AppendLine(Resources.RectangleRegion_WriteTips__Hold_Left_click_on_selection__Move_region); @@ -770,7 +770,7 @@ private void WriteTips(StringBuilder sb) if (ShapeManager.Shapes.Count > 0) { - sb.AppendLine("[Ctrl + Z] Undo shape"); + sb.AppendLine(Resources.RegionCaptureForm_WriteTips_CtrlZUndoShape); } sb.AppendLine(); @@ -790,7 +790,7 @@ private void WriteTips(StringBuilder sb) if (IsAnnotationMode) { - sb.AppendLine("[Ctrl + V] Paste image or text"); + sb.AppendLine(Resources.RegionCaptureForm_WriteTips_CtrlVPasteImageOrText); } sb.AppendLine(Resources.RectangleRegionForm_WriteTips__Mouse_wheel__Change_current_tool); @@ -848,7 +848,7 @@ private void WriteTips(StringBuilder sb) } sb.AppendLine(); - sb.AppendLine("Note: Hiding these tips will increase FPS greatly."); + sb.AppendLine(Resources.RegionCaptureForm_WriteTips_NoteHidingTheseTipsWillIncreaseFPSGreatly); } private string GetAreaText(Rectangle area) diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs index 44a1ce77e..2dcb59442 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs +++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs @@ -1021,6 +1021,60 @@ internal static string RectangleTransparent_RectangleTransparent_Rectangle_captu } } + /// + /// Looks up a localized string similar to [Arrow keys] Resize region from bottom right corner. + /// + internal static string RegionCaptureForm_WriteTips_ArrowKeysResizeRegionFromBottomRightCorner { + get { + return ResourceManager.GetString("RegionCaptureForm_WriteTips_ArrowKeysResizeRegionFromBottomRightCorner", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to [Ctrl + V] Paste image or text. + /// + internal static string RegionCaptureForm_WriteTips_CtrlVPasteImageOrText { + get { + return ResourceManager.GetString("RegionCaptureForm_WriteTips_CtrlVPasteImageOrText", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to [Ctrl + Z] Undo shape. + /// + internal static string RegionCaptureForm_WriteTips_CtrlZUndoShape { + get { + return ResourceManager.GetString("RegionCaptureForm_WriteTips_CtrlZUndoShape", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to [Hold Alt + Arrow keys] Resize region from top left corner. + /// + internal static string RegionCaptureForm_WriteTips_HoldAltArrowKeysResizeRegionFromTopLeftCorner { + get { + return ResourceManager.GetString("RegionCaptureForm_WriteTips_HoldAltArrowKeysResizeRegionFromTopLeftCorner", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Note: Hiding these tips will increase FPS greatly.. + /// + internal static string RegionCaptureForm_WriteTips_NoteHidingTheseTipsWillIncreaseFPSGreatly { + get { + return ResourceManager.GetString("RegionCaptureForm_WriteTips_NoteHidingTheseTipsWillIncreaseFPSGreatly", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to [Right click] Cancel capture / remove region. + /// + internal static string RegionCaptureForm_WriteTips_RightClickCancelCaptureRemoveRegion { + get { + return ResourceManager.GetString("RegionCaptureForm_WriteTips_RightClickCancelCaptureRemoveRegion", resourceCulture); + } + } + /// /// Looks up a localized string similar to Stop capture. /// @@ -1066,6 +1120,15 @@ internal static string ShapeManager_CreateContextMenu_Border_size_ { } } + /// + /// Looks up a localized string similar to Capture. + /// + internal static string ShapeManager_CreateContextMenu_Capture { + get { + return ResourceManager.GetString("ShapeManager_CreateContextMenu_Capture", resourceCulture); + } + } + /// /// Looks up a localized string similar to Capture active monitor. /// @@ -1102,6 +1165,15 @@ internal static string ShapeManager_CreateContextMenu_Corner_radius_ { } } + /// + /// Looks up a localized string similar to Enable animations. + /// + internal static string ShapeManager_CreateContextMenu_EnableAnimations { + get { + return ResourceManager.GetString("ShapeManager_CreateContextMenu_EnableAnimations", resourceCulture); + } + } + /// /// Looks up a localized string similar to Fill color.... /// @@ -1183,6 +1255,15 @@ internal static string ShapeManager_CreateContextMenu_Pixel_size_ { } } + /// + /// Looks up a localized string similar to Remember menu state. + /// + internal static string ShapeManager_CreateContextMenu_RememberMenuState { + get { + return ResourceManager.GetString("ShapeManager_CreateContextMenu_RememberMenuState", resourceCulture); + } + } + /// /// Looks up a localized string similar to Show FPS. /// @@ -1246,6 +1327,195 @@ internal static string ShapeManager_CreateContextMenu_Width_ { } } + /// + /// Looks up a localized string similar to Apply changes & continue task (Enter). + /// + internal static string ShapeManager_CreateToolbar_ApplyChangesContinueTaskEnter { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_ApplyChangesContinueTaskEnter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bring forward. + /// + internal static string ShapeManager_CreateToolbar_BringForward { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_BringForward", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bring to front. + /// + internal static string ShapeManager_CreateToolbar_BringToFront { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_BringToFront", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Cancel task (Esc). + /// + internal static string ShapeManager_CreateToolbar_CancelTaskEsc { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_CancelTaskEsc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Capture regions. + /// + internal static string ShapeManager_CreateToolbar_CaptureRegions { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_CaptureRegions", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Continue task (Space or right click). + /// + internal static string ShapeManager_CreateToolbar_ContinueTaskSpaceOrRightClick { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_ContinueTaskSpaceOrRightClick", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Copy image to clipboard. + /// + internal static string ShapeManager_CreateToolbar_CopyImageToClipboard { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_CopyImageToClipboard", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Delete. + /// + internal static string ShapeManager_CreateToolbar_Delete { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_Delete", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Delete all. + /// + internal static string ShapeManager_CreateToolbar_DeleteAll { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_DeleteAll", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Drop shadow. + /// + internal static string ShapeManager_CreateToolbar_DropShadow { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_DropShadow", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit. + /// + internal static string ShapeManager_CreateToolbar_Edit { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_Edit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Capture last region. + /// + internal static string ShapeManager_CreateToolbar_LastRegion { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_LastRegion", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Print image.... + /// + internal static string ShapeManager_CreateToolbar_PrintImage { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_PrintImage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Run after capture tasks. + /// + internal static string ShapeManager_CreateToolbar_RunAfterCaptureTasks { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_RunAfterCaptureTasks", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Save image. + /// + internal static string ShapeManager_CreateToolbar_SaveImage { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_SaveImage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Save image as.... + /// + internal static string ShapeManager_CreateToolbar_SaveImageAs { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_SaveImageAs", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Send backward. + /// + internal static string ShapeManager_CreateToolbar_SendBackward { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_SendBackward", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Send to back. + /// + internal static string ShapeManager_CreateToolbar_SendToBack { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_SendToBack", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Shape options. + /// + internal static string ShapeManager_CreateToolbar_ShapeOptions { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_ShapeOptions", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Undo. + /// + internal static string ShapeManager_CreateToolbar_Undo { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_Undo", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Upload image. + /// + internal static string ShapeManager_CreateToolbar_UploadImage { + get { + return ResourceManager.GetString("ShapeManager_CreateToolbar_UploadImage", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx index 938610303..f5f8511d6 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx @@ -516,4 +516,94 @@ Distance: {6:0.00} px / Angle: {7:0.00}° ..\Resources\monitor-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Enable animations + + + Remember menu state + + + Note: Hiding these tips will increase FPS greatly. + + + [Right click] Cancel capture / remove region + + + [Ctrl + V] Paste image or text + + + [Ctrl + Z] Undo shape + + + [Arrow keys] Resize region from bottom right corner + + + [Hold Alt + Arrow keys] Resize region from top left corner + + + Shape options + + + Drop shadow + + + Capture regions + + + Edit + + + Undo + + + Delete + + + Delete all + + + Bring forward + + + Send backward + + + Bring to front + + + Send to back + + + Apply changes & continue task (Enter) + + + Continue task (Space or right click) + + + Cancel task (Esc) + + + Save image + + + Save image as... + + + Copy image to clipboard + + + Upload image + + + Print image... + + + Run after capture tasks + + + Capture last region + + + Capture + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx b/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx index 4ea5639b9..a0adc506c 100644 --- a/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx +++ b/ShareX.ScreenCaptureLib/Properties/Resources.ru.resx @@ -335,4 +335,94 @@ Радиус скругления + + Включить анимации + + + Помнить состояние меню + + + Заметка: Спрячьте эти подсказки для повышения производительности (FPS). + + + [ПКМ] Отменить захват / удалить область + + + [Ctrl + V] Вставить картинку или текст + + + [Ctrl + Z] Отменить фигуру + + + [Клавиши со стрелками] Масштабировать область за правый нижний угол + + + [Удерживание Alt + Клавиши со стрелками] Масштабировать область за верхний левый угол + + + Параметры фигур + + + Тень + + + Захват областей + + + Изменить + + + Отменить + + + Удалить + + + Удалить все + + + Применить изменения и продолжить задачу (Enter) + + + Продолжить задачу (Пробел или ПКМ) + + + Отменить задачу (Esc) + + + Сохранить изображение + + + Сохранить изображение как... + + + Скопировать изображение в буфер обмена + + + Загрузить изображение + + + Распечатать изображение... + + + Выполнить задачи после захвата + + + На задний план + + + На передний план + + + Переместить назад + + + Переместить вперед + + + Захват последней области + + + Захват + \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs index 1ea760329..89c3cdfce 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs @@ -128,11 +128,11 @@ private void CreateToolbar() if (form.Mode == RegionCaptureMode.Editor) { - tsbCompleteEdit.Text = "Run after capture tasks"; + tsbCompleteEdit.Text = Resources.ShapeManager_CreateToolbar_RunAfterCaptureTasks; } else { - tsbCompleteEdit.Text = "Apply changes & continue task (Enter)"; + tsbCompleteEdit.Text = Resources.ShapeManager_CreateToolbar_ApplyChangesContinueTaskEnter; } tsbCompleteEdit.DisplayStyle = ToolStripItemDisplayStyle.Image; @@ -142,13 +142,13 @@ private void CreateToolbar() if (form.Mode == RegionCaptureMode.TaskEditor) { - ToolStripButton tsbClose = new ToolStripButton("Continue task (Space or right click)"); + ToolStripButton tsbClose = new ToolStripButton(Resources.ShapeManager_CreateToolbar_ContinueTaskSpaceOrRightClick); tsbClose.DisplayStyle = ToolStripItemDisplayStyle.Image; tsbClose.Image = Resources.control; tsbClose.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateContinueTask); tsMain.Items.Add(tsbClose); - ToolStripButton tsbCloseCancel = new ToolStripButton("Cancel task (Esc)"); + ToolStripButton tsbCloseCancel = new ToolStripButton(Resources.ShapeManager_CreateToolbar_CancelTaskEsc); tsbCloseCancel.DisplayStyle = ToolStripItemDisplayStyle.Image; tsbCloseCancel.Image = Resources.cross; tsbCloseCancel.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateCancelTask); @@ -160,32 +160,32 @@ private void CreateToolbar() tsMain.Items.Add(new ToolStripSeparator()); } - ToolStripButton tsbSaveImage = new ToolStripButton("Save image"); + ToolStripButton tsbSaveImage = new ToolStripButton(Resources.ShapeManager_CreateToolbar_SaveImage); tsbSaveImage.DisplayStyle = ToolStripItemDisplayStyle.Image; tsbSaveImage.Enabled = File.Exists(form.ImageFilePath); tsbSaveImage.Image = Resources.disk_black; tsbSaveImage.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateSaveImage); tsMain.Items.Add(tsbSaveImage); - ToolStripButton tsbSaveImageAs = new ToolStripButton("Save image as..."); + ToolStripButton tsbSaveImageAs = new ToolStripButton(Resources.ShapeManager_CreateToolbar_SaveImageAs); tsbSaveImageAs.DisplayStyle = ToolStripItemDisplayStyle.Image; tsbSaveImageAs.Image = Resources.disks_black; tsbSaveImageAs.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateSaveImageAs); tsMain.Items.Add(tsbSaveImageAs); - ToolStripButton tsbCopyImage = new ToolStripButton("Copy image to clipboard"); + ToolStripButton tsbCopyImage = new ToolStripButton(Resources.ShapeManager_CreateToolbar_CopyImageToClipboard); tsbCopyImage.DisplayStyle = ToolStripItemDisplayStyle.Image; tsbCopyImage.Image = Resources.clipboard; tsbCopyImage.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateCopyImage); tsMain.Items.Add(tsbCopyImage); - ToolStripButton tsbUploadImage = new ToolStripButton("Upload image"); + ToolStripButton tsbUploadImage = new ToolStripButton(Resources.ShapeManager_CreateToolbar_UploadImage); tsbUploadImage.DisplayStyle = ToolStripItemDisplayStyle.Image; tsbUploadImage.Image = Resources.drive_globe; tsbUploadImage.MouseDown += (sender, e) => form.Close(RegionResult.AnnotateUploadImage); tsMain.Items.Add(tsbUploadImage); - ToolStripButton tsbPrintImage = new ToolStripButton("Print image..."); + ToolStripButton tsbPrintImage = new ToolStripButton(Resources.ShapeManager_CreateToolbar_PrintImage); tsbPrintImage.DisplayStyle = ToolStripItemDisplayStyle.Image; tsbPrintImage.Image = Resources.printer; tsbPrintImage.MouseDown += (sender, e) => form.Close(RegionResult.AnnotatePrintImage); @@ -415,7 +415,7 @@ private void CreateToolbar() }; tsMain.Items.Add(tsbHighlightColor); - tsddbShapeOptions = new ToolStripDropDownButton("Shape options"); + tsddbShapeOptions = new ToolStripDropDownButton(Resources.ShapeManager_CreateToolbar_ShapeOptions); tsddbShapeOptions.DisplayStyle = ToolStripItemDisplayStyle.Image; tsddbShapeOptions.Image = Resources.layer__pencil; tsMain.Items.Add(tsddbShapeOptions); @@ -491,7 +491,7 @@ private void CreateToolbar() }; tsddbShapeOptions.DropDownItems.Add(tslnudPixelateSize); - tsmiShadow = new ToolStripMenuItem("Drop shadow"); + tsmiShadow = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_DropShadow); tsmiShadow.Checked = true; tsmiShadow.CheckOnClick = true; tsmiShadow.Click += (sender, e) => @@ -508,12 +508,12 @@ private void CreateToolbar() #region Edit - ToolStripDropDownButton tsddbEdit = new ToolStripDropDownButton("Edit"); + ToolStripDropDownButton tsddbEdit = new ToolStripDropDownButton(Resources.ShapeManager_CreateToolbar_Edit); tsddbEdit.DisplayStyle = ToolStripItemDisplayStyle.Image; tsddbEdit.Image = Resources.wrench_screwdriver; tsMain.Items.Add(tsddbEdit); - tsmiUndo = new ToolStripMenuItem("Undo"); + tsmiUndo = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_Undo); tsmiUndo.Image = Resources.arrow_circle_225_left; tsmiUndo.ShortcutKeyDisplayString = "Ctrl+Z"; tsmiUndo.MouseDown += (sender, e) => UndoShape(); @@ -521,13 +521,13 @@ private void CreateToolbar() tsddbEdit.DropDownItems.Add(new ToolStripSeparator()); - tsmiDelete = new ToolStripMenuItem("Delete"); + tsmiDelete = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_Delete); tsmiDelete.Image = Resources.layer__minus; tsmiDelete.ShortcutKeyDisplayString = "Del"; tsmiDelete.MouseDown += (sender, e) => DeleteCurrentShape(); tsddbEdit.DropDownItems.Add(tsmiDelete); - tsmiDeleteAll = new ToolStripMenuItem("Delete all"); + tsmiDeleteAll = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_DeleteAll); tsmiDeleteAll.Image = Resources.eraser; tsmiDeleteAll.ShortcutKeyDisplayString = "Shift+Del"; tsmiDeleteAll.MouseDown += (sender, e) => DeleteAllShapes(); @@ -535,25 +535,25 @@ private void CreateToolbar() tsddbEdit.DropDownItems.Add(new ToolStripSeparator()); - tsmiMoveTop = new ToolStripMenuItem("Bring to front"); + tsmiMoveTop = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_BringToFront); tsmiMoveTop.Image = Resources.layers_stack_arrange; tsmiMoveTop.ShortcutKeyDisplayString = "Home"; tsmiMoveTop.MouseDown += (sender, e) => MoveCurrentShapeTop(); tsddbEdit.DropDownItems.Add(tsmiMoveTop); - tsmiMoveUp = new ToolStripMenuItem("Bring forward"); + tsmiMoveUp = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_BringForward); tsmiMoveUp.Image = Resources.layers_arrange; tsmiMoveUp.ShortcutKeyDisplayString = "Page up"; tsmiMoveUp.MouseDown += (sender, e) => MoveCurrentShapeUp(); tsddbEdit.DropDownItems.Add(tsmiMoveUp); - tsmiMoveDown = new ToolStripMenuItem("Send backward"); + tsmiMoveDown = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_SendBackward); tsmiMoveDown.Image = Resources.layers_arrange_back; tsmiMoveDown.ShortcutKeyDisplayString = "Page down"; tsmiMoveDown.MouseDown += (sender, e) => MoveCurrentShapeDown(); tsddbEdit.DropDownItems.Add(tsmiMoveDown); - tsmiMoveBottom = new ToolStripMenuItem("Send to back"); + tsmiMoveBottom = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_SendToBack); tsmiMoveBottom.Image = Resources.layers_stack_arrange_back; tsmiMoveBottom.ShortcutKeyDisplayString = "End"; tsmiMoveBottom.MouseDown += (sender, e) => MoveCurrentShapeBottom(); @@ -567,12 +567,12 @@ private void CreateToolbar() #region Capture - ToolStripDropDownButton tsddbCapture = new ToolStripDropDownButton("Capture"); + ToolStripDropDownButton tsddbCapture = new ToolStripDropDownButton(Resources.ShapeManager_CreateContextMenu_Capture); tsddbCapture.DisplayStyle = ToolStripItemDisplayStyle.Image; tsddbCapture.Image = Resources.camera; tsMain.Items.Add(tsddbCapture); - tsmiRegionCapture = new ToolStripMenuItem("Capture regions"); + tsmiRegionCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_CaptureRegions); tsmiRegionCapture.Image = Resources.layer; tsmiRegionCapture.ShortcutKeyDisplayString = "Enter"; tsmiRegionCapture.MouseDown += (sender, e) => @@ -584,7 +584,7 @@ private void CreateToolbar() if (RegionCaptureForm.LastRegionFillPath != null) { - ToolStripMenuItem tsmiLastRegionCapture = new ToolStripMenuItem("Capture last region"); + ToolStripMenuItem tsmiLastRegionCapture = new ToolStripMenuItem(Resources.ShapeManager_CreateToolbar_LastRegion); tsmiLastRegionCapture.Image = Resources.layers; tsmiLastRegionCapture.MouseDown += (sender, e) => form.Close(RegionResult.LastRegion); tsddbCapture.DropDownItems.Add(tsmiLastRegionCapture); @@ -685,7 +685,7 @@ private void CreateToolbar() tsmiShowCrosshair.Click += (sender, e) => Config.ShowCrosshair = tsmiShowCrosshair.Checked; tsddbOptions.DropDownItems.Add(tsmiShowCrosshair); - ToolStripMenuItem tsmiEnableAnimations = new ToolStripMenuItem("Enable animations"); // TODO: Translate + ToolStripMenuItem tsmiEnableAnimations = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_EnableAnimations); tsmiEnableAnimations.Checked = Config.EnableAnimations; tsmiEnableAnimations.CheckOnClick = true; tsmiEnableAnimations.Click += (sender, e) => Config.EnableAnimations = tsmiEnableAnimations.Checked; @@ -713,7 +713,7 @@ private void CreateToolbar() tsmiShowFPS.Click += (sender, e) => Config.ShowFPS = tsmiShowFPS.Checked; tsddbOptions.DropDownItems.Add(tsmiShowFPS); - ToolStripMenuItem tsmiRememberMenuState = new ToolStripMenuItem("Remember menu state"); + ToolStripMenuItem tsmiRememberMenuState = new ToolStripMenuItem(Resources.ShapeManager_CreateContextMenu_RememberMenuState); tsmiRememberMenuState.Checked = Config.RememberMenuState; tsmiRememberMenuState.CheckOnClick = true; tsmiRememberMenuState.Click += (sender, e) => Config.RememberMenuState = tsmiRememberMenuState.Checked; diff --git a/ShareX.UploadersLib/Controls/OAuthControl.cs b/ShareX.UploadersLib/Controls/OAuthControl.cs index 67c7fec17..77729cc67 100644 --- a/ShareX.UploadersLib/Controls/OAuthControl.cs +++ b/ShareX.UploadersLib/Controls/OAuthControl.cs @@ -112,7 +112,7 @@ public OAuthControl() defaultGroupBoxSize = gbUserAccount.Size; smallGroupBoxSize = new Size(defaultGroupBoxSize.Width, (int)(defaultGroupBoxSize.Height / 1.16f)); IsRefreshable = true; - txtVerificationCode.HandleCreated += (sender, e) => txtVerificationCode.SetWatermark("Paste verification code here"); + txtVerificationCode.HandleCreated += (sender, e) => txtVerificationCode.SetWatermark(Resources.OAuthControl_OAuthControl_PasteVerificationCodeHere); } private void btnOpenAuthorizePage_Click(object sender, EventArgs e) diff --git a/ShareX.UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs index 04317b4a7..c37a01849 100644 --- a/ShareX.UploadersLib/Enums.cs +++ b/ShareX.UploadersLib/Enums.cs @@ -210,8 +210,7 @@ public enum URLSharingServices VK, [Description("Pushbullet")] Pushbullet, - [Description("Google image search")] - GoogleImageSearch + GoogleImageSearch // Localized } public enum HttpMethod @@ -324,14 +323,10 @@ public enum CustomUploaderDestinationType { [Description("None")] None = 0, - [Description("Image uploader")] - ImageUploader = 1, - [Description("Text uploader")] - TextUploader = 1 << 1, - [Description("File uploader")] - FileUploader = 1 << 2, - [Description("URL shortener")] - URLShortener = 1 << 3 + ImageUploader = 1, // Localized + TextUploader = 1 << 1, // Localized + FileUploader = 1 << 2, // Localized + URLShortener = 1 << 3 // Localized } public enum FTPSEncryption diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index bf97334c3..f114bc413 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -113,7 +113,7 @@ private void InitializeControls() // Custom uploader txtCustomUploaderLog.AddContextMenu(); eiCustomUploaders.ObjectType = typeof(CustomUploaderItem); - txtCustomUploaderName.HandleCreated += (sender, e) => txtCustomUploaderName.SetWatermark("Name"); + txtCustomUploaderName.HandleCreated += (sender, e) => txtCustomUploaderName.SetWatermark(Resources.UploadersConfigForm_CustomUploader_Name); AddCustomUploaderDestinationTypes(); cbCustomUploaderRequestType.Items.AddRange(Enum.GetNames(typeof(CustomUploaderRequestType))); cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.ru.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.ru.resx index 1e8e681ae..cf054a3e6 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.ru.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.ru.resx @@ -1136,4 +1136,19 @@ store.book[0].title Конечные точки: + + Данные для входа + + + Другие настройки + + + Сервер Jira + + + Регион: + + + Использовать запрос в виде пути + \ No newline at end of file diff --git a/ShareX.UploadersLib/Properties/Resources.Designer.cs b/ShareX.UploadersLib/Properties/Resources.Designer.cs index 56360adcb..ea233e4c1 100644 --- a/ShareX.UploadersLib/Properties/Resources.Designer.cs +++ b/ShareX.UploadersLib/Properties/Resources.Designer.cs @@ -403,6 +403,15 @@ internal static System.Drawing.Icon Minus { } } + /// + /// Looks up a localized string similar to Paste verification code here. + /// + internal static string OAuthControl_OAuthControl_PasteVerificationCodeHere { + get { + return ResourceManager.GetString("OAuthControl_OAuthControl_PasteVerificationCodeHere", resourceCulture); + } + } + /// /// Looks up a localized string similar to Status: Logged in.. /// @@ -696,6 +705,15 @@ internal static string UploadersConfigForm_BoxListFolders_Box_refresh_folders_li } } + /// + /// Looks up a localized string similar to Name. + /// + internal static string UploadersConfigForm_CustomUploader_Name { + get { + return ResourceManager.GetString("UploadersConfigForm_CustomUploader_Name", resourceCulture); + } + } + /// /// Looks up a localized string similar to Error. /// diff --git a/ShareX.UploadersLib/Properties/Resources.resx b/ShareX.UploadersLib/Properties/Resources.resx index 4192db0e4..7aa9e5554 100644 --- a/ShareX.UploadersLib/Properties/Resources.resx +++ b/ShareX.UploadersLib/Properties/Resources.resx @@ -389,4 +389,10 @@ Created folders: ..\favicons\gfycat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Paste verification code here + + + Name + \ No newline at end of file diff --git a/ShareX.UploadersLib/Properties/Resources.ru.resx b/ShareX.UploadersLib/Properties/Resources.ru.resx index 54f669d61..984ff9687 100644 --- a/ShareX.UploadersLib/Properties/Resources.ru.resx +++ b/ShareX.UploadersLib/Properties/Resources.ru.resx @@ -229,4 +229,10 @@ Убрать все пользовательские загрузчики? + + Вставьте код подтверждения сюда + + + Имя + \ No newline at end of file diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs index 424a3dcf5..3e1d69663 100644 --- a/ShareX/Forms/AboutForm.cs +++ b/ShareX/Forms/AboutForm.cs @@ -82,18 +82,18 @@ public AboutForm() {Resources.AboutForm_AboutForm_Translators}: -Turkish: https://github.com/Jaex & https://github.com/muratmoon -German: https://github.com/Starbug2 & https://github.com/Kaeltis -French: https://github.com/nwies & https://github.com/Shadorc -Simplified Chinese: https://github.com/jiajiechan -Hungarian: https://github.com/devBluestar -Korean: https://github.com/123jimin -Spanish: https://github.com/ovnisoftware -Dutch: https://github.com/canihavesomecoffee -Portuguese (Brazil): https://github.com/RockyTV & https://github.com/athosbr99 -Vietnamese: https://github.com/thanhpd -Russian: https://github.com/L1Q -Traditional Chinese: https://github.com/alantsai +{Resources.AboutForm_AboutForm_Language_tr}: https://github.com/Jaex & https://github.com/muratmoon +{Resources.AboutForm_AboutForm_Language_de}: https://github.com/Starbug2 & https://github.com/Kaeltis +{Resources.AboutForm_AboutForm_Language_fr}: https://github.com/nwies & https://github.com/Shadorc +{Resources.AboutForm_AboutForm_Language_zh_CH}: https://github.com/jiajiechan +{Resources.AboutForm_AboutForm_Language_hu}: https://github.com/devBluestar +{Resources.AboutForm_AboutForm_Language_ko_KR}: https://github.com/123jimin +{Resources.AboutForm_AboutForm_Language_es}: https://github.com/ovnisoftware +{Resources.AboutForm_AboutForm_Language_nl_NL}: https://github.com/canihavesomecoffee +{Resources.AboutForm_AboutForm_Language_pt_BR}: https://github.com/RockyTV & https://github.com/athosbr99 +{Resources.AboutForm_AboutForm_Language_vi_VN}: https://github.com/thanhpd +{Resources.AboutForm_AboutForm_Language_ru}: https://github.com/L1Q +{Resources.AboutForm_AboutForm_Language_zh_TW}: https://github.com/alantsai {Resources.AboutForm_AboutForm_External_libraries}: diff --git a/ShareX/Forms/AboutForm.resx b/ShareX/Forms/AboutForm.resx index ffaebf7fd..725226a48 100644 --- a/ShareX/Forms/AboutForm.resx +++ b/ShareX/Forms/AboutForm.resx @@ -578,7 +578,7 @@ Build - + @Invariant False diff --git a/ShareX/Forms/ActionsToolbarEditForm.Designer.cs b/ShareX/Forms/ActionsToolbarEditForm.Designer.cs index f60e3f445..c8cb41882 100644 --- a/ShareX/Forms/ActionsToolbarEditForm.Designer.cs +++ b/ShareX/Forms/ActionsToolbarEditForm.Designer.cs @@ -29,6 +29,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ActionsToolbarEditForm)); this.btnRemove = new System.Windows.Forms.Button(); this.btnAdd = new ShareX.HelpersLib.MenuButton(); this.cmsAction = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -39,75 +40,61 @@ private void InitializeComponent() // // btnRemove // - this.btnRemove.Location = new System.Drawing.Point(128, 8); + resources.ApplyResources(this.btnRemove, "btnRemove"); this.btnRemove.Name = "btnRemove"; - this.btnRemove.Size = new System.Drawing.Size(112, 23); - this.btnRemove.TabIndex = 1; - this.btnRemove.Text = "Remove"; this.btnRemove.UseVisualStyleBackColor = true; this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click); // // btnAdd // - this.btnAdd.Location = new System.Drawing.Point(8, 8); + resources.ApplyResources(this.btnAdd, "btnAdd"); this.btnAdd.Menu = this.cmsAction; this.btnAdd.Name = "btnAdd"; - this.btnAdd.Size = new System.Drawing.Size(115, 23); - this.btnAdd.TabIndex = 2; - this.btnAdd.Text = "Add"; this.btnAdd.UseVisualStyleBackColor = true; // // cmsAction // this.cmsAction.Name = "cmsAction"; - this.cmsAction.Size = new System.Drawing.Size(61, 4); + resources.ApplyResources(this.cmsAction, "cmsAction"); // // lvActions // this.lvActions.AllowDrop = true; this.lvActions.AllowItemDrag = true; - this.lvActions.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + resources.ApplyResources(this.lvActions, "lvActions"); this.lvActions.AutoFillColumn = true; this.lvActions.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.chAction}); this.lvActions.FullRowSelect = true; this.lvActions.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; this.lvActions.HideSelection = false; - this.lvActions.Location = new System.Drawing.Point(8, 40); this.lvActions.MultiSelect = false; this.lvActions.Name = "lvActions"; - this.lvActions.Size = new System.Drawing.Size(448, 368); this.lvActions.SmallImageList = this.ilMain; - this.lvActions.TabIndex = 3; this.lvActions.UseCompatibleStateImageBehavior = false; this.lvActions.View = System.Windows.Forms.View.Details; this.lvActions.ItemMoved += new ShareX.HelpersLib.MyListView.ListViewItemMovedEventHandler(this.lvActions_ItemMoved); // // chAction // - this.chAction.Width = 435; + resources.ApplyResources(this.chAction, "chAction"); // // ilMain // this.ilMain.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit; - this.ilMain.ImageSize = new System.Drawing.Size(16, 16); + resources.ApplyResources(this.ilMain, "ilMain"); this.ilMain.TransparentColor = System.Drawing.Color.Transparent; // // ActionsToolbarEditForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; - this.ClientSize = new System.Drawing.Size(465, 417); this.Controls.Add(this.lvActions); this.Controls.Add(this.btnAdd); this.Controls.Add(this.btnRemove); this.Name = "ActionsToolbarEditForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "ShareX - Edit actions toolbar"; this.ResumeLayout(false); } diff --git a/ShareX/Forms/ActionsToolbarEditForm.cs b/ShareX/Forms/ActionsToolbarEditForm.cs index de18cec3e..6c3ee64de 100644 --- a/ShareX/Forms/ActionsToolbarEditForm.cs +++ b/ShareX/Forms/ActionsToolbarEditForm.cs @@ -37,8 +37,6 @@ public partial class ActionsToolbarEditForm : Form { public List Actions { get; private set; } - private const string Separator = "Separator"; // TODO: Translate - public ActionsToolbarEditForm(List actions) { InitializeComponent(); @@ -85,7 +83,7 @@ private void AddEnumItemsContextMenu(Action selectedEnum, params Too if (hotkeyType == HotkeyType.None) { - text = Separator; + text = Resources.ActionsToolbarEditForm_Separator; img = Resources.ui_splitter; } else @@ -135,7 +133,7 @@ private void AddActionToList(HotkeyType hotkeyType) if (hotkeyType == HotkeyType.None) { - text = Separator; + text = Resources.ActionsToolbarEditForm_Separator; } else { diff --git a/ShareX/Forms/ActionsToolbarEditForm.resx b/ShareX/Forms/ActionsToolbarEditForm.resx index 92efb8ae5..693018c5f 100644 --- a/ShareX/Forms/ActionsToolbarEditForm.resx +++ b/ShareX/Forms/ActionsToolbarEditForm.resx @@ -117,10 +117,133 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 128, 8 + + + 112, 23 + + + + 1 + + + Remove + + + btnRemove + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 8, 8 + 17, 17 + + 61, 4 + + + cmsAction + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 115, 23 + + + 2 + + + Add + + + btnAdd + + + ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + + + + Top, Bottom, Left, Right + + + 435 + + + 8, 40 + + + 448, 368 + 125, 17 + + 16, 16 + + + 3 + + + lvActions + + + ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + True + + + 6, 13 + + + 465, 417 + + + CenterScreen + + + ShareX - Edit actions toolbar + + + chAction + + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ilMain + + + System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ActionsToolbarEditForm + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/ShareX/Forms/ActionsToolbarEditForm.ru.resx b/ShareX/Forms/ActionsToolbarEditForm.ru.resx new file mode 100644 index 000000000..182f392c6 --- /dev/null +++ b/ShareX/Forms/ActionsToolbarEditForm.ru.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Удалить + + + Добавить + + + ShareX - Редактирование панели действий + + \ No newline at end of file diff --git a/ShareX/Forms/ActionsToolbarForm.cs b/ShareX/Forms/ActionsToolbarForm.cs index 371deaa3a..2a904c747 100644 --- a/ShareX/Forms/ActionsToolbarForm.cs +++ b/ShareX/Forms/ActionsToolbarForm.cs @@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License #endregion License Information (GPL v3) using ShareX.HelpersLib; +using ShareX.Properties; using System; using System.Collections.Generic; using System.ComponentModel; @@ -129,25 +130,25 @@ private void InitializeComponent() cmsTitle = new ContextMenuStrip(components); - ToolStripMenuItem tsmiClose = new ToolStripMenuItem("Close"); + ToolStripMenuItem tsmiClose = new ToolStripMenuItem(Resources.ActionsToolbar_Close); tsmiClose.Click += TsmiClose_Click; cmsTitle.Items.Add(tsmiClose); cmsTitle.Items.Add(new ToolStripSeparator()); - ToolStripMenuItem tsmiLock = new ToolStripMenuItem("Lock position"); + ToolStripMenuItem tsmiLock = new ToolStripMenuItem(Resources.ActionsToolbar__LockPosition); tsmiLock.CheckOnClick = true; tsmiLock.Checked = Program.Settings.ActionsToolbarLockPosition; tsmiLock.Click += TsmiLock_Click; cmsTitle.Items.Add(tsmiLock); - ToolStripMenuItem tsmiTopMost = new ToolStripMenuItem("Stay top most"); + ToolStripMenuItem tsmiTopMost = new ToolStripMenuItem(Resources.ActionsToolbar_StayTopMost); tsmiTopMost.CheckOnClick = true; tsmiTopMost.Checked = Program.Settings.ActionsToolbarStayTopMost; tsmiTopMost.Click += TsmiTopMost_Click; cmsTitle.Items.Add(tsmiTopMost); - ToolStripMenuItem tsmiRunAtStartup = new ToolStripMenuItem("Open at ShareX startup"); + ToolStripMenuItem tsmiRunAtStartup = new ToolStripMenuItem(Resources.ActionsToolbar_OpenAtShareXStartup); tsmiRunAtStartup.CheckOnClick = true; tsmiRunAtStartup.Checked = Program.Settings.ActionsToolbarRunAtStartup; tsmiRunAtStartup.Click += TsmiRunAtStartup_Click; @@ -155,7 +156,7 @@ private void InitializeComponent() cmsTitle.Items.Add(new ToolStripSeparator()); - ToolStripMenuItem tsmiEdit = new ToolStripMenuItem("Edit..."); + ToolStripMenuItem tsmiEdit = new ToolStripMenuItem(Resources.ActionsToolbar_Edit); tsmiEdit.Click += TsmiEdit_Click; cmsTitle.Items.Add(tsmiEdit); @@ -309,7 +310,7 @@ private void UpdateToolbar(List actions) { Margin = new Padding(4, 0, 3, 0), Text = "ShareX", - ToolTipText = "Hold left down to drag\r\nRight click to open menu\r\nMiddle click to close" + ToolTipText = Resources.ActionsToolbar_Tip }; tslTitle.MouseDown += tslTitle_MouseDown; diff --git a/ShareX/Forms/ApplicationSettingsForm.resx b/ShareX/Forms/ApplicationSettingsForm.resx index 6918d9eca..4bc3513f1 100644 --- a/ShareX/Forms/ApplicationSettingsForm.resx +++ b/ShareX/Forms/ApplicationSettingsForm.resx @@ -818,7 +818,7 @@ Status - + @Invariant False diff --git a/ShareX/Forms/MainForm.ru.resx b/ShareX/Forms/MainForm.ru.resx index 0a1b2ad59..c154e727c 100644 --- a/ShareX/Forms/MainForm.ru.resx +++ b/ShareX/Forms/MainForm.ru.resx @@ -646,7 +646,7 @@ Убрать задачу из списка - Искать изображение в Google... + Искать по картинке в Google... Распознать текст (OCR) @@ -660,4 +660,16 @@ Редактировать изображение… + + Новости + + + Закрыть + + + О программе… + + + Пожертвовать… + \ No newline at end of file diff --git a/ShareX/IntegrationHelpers.cs b/ShareX/IntegrationHelpers.cs index a7b055f50..8bd92e3be 100644 --- a/ShareX/IntegrationHelpers.cs +++ b/ShareX/IntegrationHelpers.cs @@ -59,7 +59,7 @@ public static class IntegrationHelpers private static readonly string ShellExtMenuFolders = @"Software\Classes\Folder\shell\" + ApplicationName; private static readonly string ShellExtMenuFoldersCmd = ShellExtMenuFolders + @"\command"; - private static readonly string ShellExtDesc = string.Format("Upload with {0}", ApplicationName); // TODO: Translate + private static readonly string ShellExtDesc = Resources.IntegrationHelpers_UploadWithShareX; private static readonly string ShellExtIcon = ApplicationPath + ",0"; private static readonly string ShellExtPath = ApplicationPath + " \"%1\""; diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index b88804d2e..66bb95012 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -87,6 +87,114 @@ public static string AboutForm_AboutForm_External_libraries { } } + /// + /// Looks up a localized string similar to German. + /// + public static string AboutForm_AboutForm_Language_de { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_de", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Spanish. + /// + public static string AboutForm_AboutForm_Language_es { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_es", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to French. + /// + public static string AboutForm_AboutForm_Language_fr { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_fr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Hungarian. + /// + public static string AboutForm_AboutForm_Language_hu { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_hu", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Korean. + /// + public static string AboutForm_AboutForm_Language_ko_KR { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_ko_KR", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Dutch. + /// + public static string AboutForm_AboutForm_Language_nl_NL { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_nl_NL", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Portuguese (Brazil). + /// + public static string AboutForm_AboutForm_Language_pt_BR { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_pt_BR", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Russian. + /// + public static string AboutForm_AboutForm_Language_ru { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_ru", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Turkish. + /// + public static string AboutForm_AboutForm_Language_tr { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_tr", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Vietnamese. + /// + public static string AboutForm_AboutForm_Language_vi_VN { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_vi_VN", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Simplified Chinese. + /// + public static string AboutForm_AboutForm_Language_zh_CH { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_zh_CH", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Traditional Chinese. + /// + public static string AboutForm_AboutForm_Language_zh_TW { + get { + return ResourceManager.GetString("AboutForm_AboutForm_Language_zh_TW", resourceCulture); + } + } + /// /// Looks up a localized string similar to Project page. /// @@ -132,6 +240,71 @@ public static string ActionsForm_btnOK_Click_Name_can_t_be_empty_ { } } + /// + /// Looks up a localized string similar to Lock position. + /// + public static string ActionsToolbar__LockPosition { + get { + return ResourceManager.GetString("ActionsToolbar__LockPosition", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Close. + /// + public static string ActionsToolbar_Close { + get { + return ResourceManager.GetString("ActionsToolbar_Close", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit.... + /// + public static string ActionsToolbar_Edit { + get { + return ResourceManager.GetString("ActionsToolbar_Edit", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Open at ShareX startup. + /// + public static string ActionsToolbar_OpenAtShareXStartup { + get { + return ResourceManager.GetString("ActionsToolbar_OpenAtShareXStartup", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Stay top most. + /// + public static string ActionsToolbar_StayTopMost { + get { + return ResourceManager.GetString("ActionsToolbar_StayTopMost", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Hold left down to drag + ///Right click to open menu + ///Middle click to close. + /// + public static string ActionsToolbar_Tip { + get { + return ResourceManager.GetString("ActionsToolbar_Tip", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Separator. + /// + public static string ActionsToolbarEditForm_Separator { + get { + return ResourceManager.GetString("ActionsToolbarEditForm_Separator", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -1254,6 +1427,15 @@ public static System.Drawing.Bitmap information { } } + /// + /// Looks up a localized string similar to Upload with ShareX. + /// + public static string IntegrationHelpers_UploadWithShareX { + get { + return ResourceManager.GetString("IntegrationHelpers_UploadWithShareX", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 91c661b38..5473f8868 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -886,4 +886,66 @@ Would you like to restart ShareX? ..\Resources\Exclamation-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Upload with ShareX + + + Separator + + + Close + + + Lock position + + + Stay top most + + + Open at ShareX startup + + + Edit... + + + Hold left down to drag +Right click to open menu +Middle click to close + + + Turkish + + + German + + + French + + + Simplified Chinese + + + Hungarian + + + Korean + + + Spanish + + + Dutch + + + Portuguese (Brazil) + + + Vietnamese + + + Russian + + + Traditional Chinese + \ No newline at end of file diff --git a/ShareX/Properties/Resources.ru.resx b/ShareX/Properties/Resources.ru.resx index f07ad5cd4..115893038 100644 --- a/ShareX/Properties/Resources.ru.resx +++ b/ShareX/Properties/Resources.ru.resx @@ -486,4 +486,66 @@ {0} конфигурация не верна или отсутствует. Пожалуйста перейдите в окно "Настройки сервисов" чтобы ее настроить. + + Загрузить с помощью ShareX + + + Разделитель + + + Закрыть + + + Зафиксировать + + + Поверх всех окон + + + Открывать при запуске ShareX + + + Редактировать... + + + Удерживайте левую кнопку мыши для перемещения +Кликните правой конопкой мыши, чтобы открыть меню +Средней кнопкой мыши, чтобы закрыть панель + + + Турецкий + + + Немецкий + + + Французский + + + Упрощённый китайский + + + Венгерский + + + Корейский + + + Испанский + + + Нидерландский + + + Португальский (Бразилия) + + + Вьетнамский + + + Русский + + + Традиционный китайский + \ No newline at end of file diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index d40ea4f9b..c80e7ec90 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -445,6 +445,9 @@ ActionsForm.cs + + ActionsToolbarEditForm.cs + AfterCaptureForm.cs