CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 09:47:22 +13:00
Code Issues Projects Releases Packages Wiki Activity

Resx updates

Browse source
This commit is contained in:
Jaex 2016-05-04 17:01:03 +03:00
parent a1e5c5150f
commit 3672146681
12 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.ScreenCaptureLib/Forms/RectangleRegionForm.cs
View file

@ -386,6 +386,8 @@ protected virtual void WriteTips(StringBuilder sb)
else
{
sb.AppendLine(Resources.RectangleRegion_WriteTips__Hold_Left_click__Start_region_selection);
// TODO: Translate
sb.AppendLine("[Right click] Open region capture menu");
sb.AppendLine(Resources.RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture);
}

4
ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs generated
View file

@ -482,7 +482,7 @@ internal static string RectangleRegion_WriteTips__Numpad_5__Diamond_shape {
}
/// <summary>
/// Looks up a localized string similar to [Right click] [Esc] Cancel capture.
/// Looks up a localized string similar to [Esc] Cancel capture.
/// </summary>
internal static string RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture {
get {
@ -500,7 +500,7 @@ internal static string RectangleRegion_WriteTips__Right_click__Cancel_region_sel
}
/// <summary>
/// Looks up a localized string similar to [Right click on selection] [Delete] Remove region.
/// Looks up a localized string similar to [Delete] Remove region.
/// </summary>
internal static string RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region {
get {

4
ShareX.ScreenCaptureLib/Properties/Resources.de.resx
View file

@ -276,12 +276,12 @@ Distanz: {6:0.00} px / Winkel: {7:0.00}°</value>
<value>[Leertaste] Vollbild Aufnahme</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Rechtsklick] [Esc] Aufnahme abbrechen</value>
<value>[Esc] Aufnahme abbrechen</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click__Cancel_region_selection" xml:space="preserve">
<value>[Rechtsklick] [Entf] Regionsauswahl abbrechen</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Rechtsklick auf Auswahl] [Entf] Region entfernen</value>
<value>[Entf] Region entfernen</value>
</data>
</root>

4
ShareX.ScreenCaptureLib/Properties/Resources.fr.resx
View file

@ -210,7 +210,7 @@ Distance : {6:0.00} px / Angle : {7:0.00}°</value>
<value>Arrêter</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Clic droit] [Echap] Annuler la capture</value>
<value>[Echap] Annuler la capture</value>
</data>
<data name="RectangleRegion_WriteTips__Space__Fullscreen_capture" xml:space="preserve">
<value>[Espace] Capture plein écran</value>
@ -240,7 +240,7 @@ Distance : {6:0.00} px / Angle : {7:0.00}°</value>
<value>[Clic droit] [Suppr] Annuler la sélection de la région</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Clic droit sur la sélection] [Suppr] Supprimer la région</value>
<value>[Suppr] Supprimer la région</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad___or____Change_triangle_angle" xml:space="preserve">
<value>[Pavé numérique + ou -] Changer l'angle du triangle</value>

4
ShareX.ScreenCaptureLib/Properties/Resources.nl-NL.resx
View file

@ -261,13 +261,13 @@ Afstand: {6:0.00} px / Hoek: {7:0.00}°</value>
<value>[Numpad 5] Diamantvorm</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Rechterklik] [Esc] Annuleer vastleggen</value>
<value>[Esc] Annuleer vastleggen</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click__Cancel_region_selection" xml:space="preserve">
<value>[Rechterklik] [Delete] Annuleer selectie regio</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Rechterklik op selectie] [Delete] Verwijder regio</value>
<value>[Delete] Verwijder regio</value>
</data>
<data name="RectangleRegion_WriteTips__Space__Fullscreen_capture" xml:space="preserve">
<value>[Spatie] Leg volledig scherm vast</value>

4
ShareX.ScreenCaptureLib/Properties/Resources.pt-BR.resx
View file

@ -202,7 +202,7 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}°</value>
<value>[Ctrl + Scroll] Alterar tamanho da caneta</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Botão Direito] [Esc] Cancelar captura</value>
<value>[Esc] Cancelar captura</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click__Cancel_region_selection" xml:space="preserve">
<value>[Botão Direito] Cancelar seleção de região</value>
@ -229,7 +229,7 @@ Distância: {6:0.00} px / Ângulo: {7:0.00}°</value>
<value>[Ctrl + Setas do teclado] Mover posição do cursor mais rapido</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Botão Direito na seleção] [Delete] Remover região</value>
<value>[Delete] Remover região</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_1__Rectangle_shape" xml:space="preserve">
<value>[Teclado numérico 1] Formato de retângulo</value>

4
ShareX.ScreenCaptureLib/Properties/Resources.resx
View file

@ -174,7 +174,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<value>[Numpad 4] Triangle shape</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Right click on selection] [Delete] Remove region</value>
<value>[Delete] Remove region</value>
</data>
<data name="RectangleRegion_WriteTips__Arrow_keys__Resize_selected_region_from__0_" xml:space="preserve">
<value>[Arrow keys] Resize selected region from {0}</value>
@ -217,7 +217,7 @@ Distance: {6:0.00} px / Angle: {7:0.00}°</value>
<value>[Hold Alt] Snap selection to preset sizes</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Right click] [Esc] Cancel capture</value>
<value>[Esc] Cancel capture</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape" xml:space="preserve">
<value>[Numpad 2] Rounded rectangle shape</value>

4
ShareX.ScreenCaptureLib/Properties/Resources.ru.resx
View file

@ -159,13 +159,13 @@
<value>[Tab] Якорь масштабирования {0}</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[ПКМ] [Esc] Отменить захват</value>
<value>[Esc] Отменить захват</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click__Cancel_region_selection" xml:space="preserve">
<value>[ПКМ] [Delete] Отменить выделение области</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[ПКМ на выделении] [Delete] Удалить область</value>
<value>[Delete] Удалить область</value>
</data>
<data name="RectangleRegion_WriteTips__Ctrl___Arrow_keys__Move_cursor_position_faster" xml:space="preserve">
<value>[Ctrl + Клавиши со стрелками] Двигать курсор быстрее</value>

4
ShareX.ScreenCaptureLib/Properties/Resources.tr.resx
View file

@ -261,13 +261,13 @@ Mesafe: {6:0.00} px / Açı: {7:0.00}°</value>
<value>[Tuş takımı 5] Elmas şekli</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Sağ tık] [Esc] Yakalamayı iptal et</value>
<value>[Esc] Yakalamayı iptal et</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click__Cancel_region_selection" xml:space="preserve">
<value>[Sağ tık] Alan seçimini iptal et</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Sağ tık seçim üstünde] [Delete] Alanı sil</value>
<value>[Delete] Alanı sil</value>
</data>
<data name="RectangleRegion_WriteTips__Space__Fullscreen_capture" xml:space="preserve">
<value>[Space] Tam ekran yakala</value>

4
ShareX.ScreenCaptureLib/Properties/Resources.vi-VN.resx
View file

@ -199,7 +199,7 @@
<value>[Chuột phải] [Delete] Hủy chọn vùng</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[Chuột phải vào vùng chọn] [Delete] Xóa vùng</value>
<value>[Delete] Xóa vùng</value>
</data>
<data name="RectangleRegion_WriteTips_top_left" xml:space="preserve">
<value>trên bên trái</value>
@ -220,7 +220,7 @@
<value>[Dấu cách] Chụp toàn màn hình</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[Chuột phải] [Esc] Hủy chụp</value>
<value>[Esc] Hủy chụp</value>
</data>
<data name="RectangleRegion_GetAreaText_Area" xml:space="preserve">
<value>X: {0} Y: {1} W: {2} H: {3}</value>

4
ShareX.ScreenCaptureLib/Properties/Resources.zh-CN.resx
View file

@ -183,7 +183,7 @@
<value>[小键盘4]三角形状</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click_on_selection___Delete__Remove_region" xml:space="preserve">
<value>[右键单击选择区域][Delete]删除区域</value>
<value>[Delete]删除区域</value>
</data>
<data name="RectangleRegion_WriteTips__Arrow_keys__Resize_selected_region_from__0_" xml:space="preserve">
<value>[方向键]从{0}调整所选区域</value>
@ -213,7 +213,7 @@
<value>[按住Alt键]重置捕捉选择区域至预设大小</value>
</data>
<data name="RectangleRegion_WriteTips__Right_click___Esc__Cancel_capture" xml:space="preserve">
<value>[点击右键] [Esc]取消捕捉</value>
<value>[Esc]取消捕捉</value>
</data>
<data name="RectangleRegion_WriteTips__Numpad_2__Rounded_rectangle_shape" xml:space="preserve">
<value>[小键盘2]圆角矩形</value>

23
ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs
View file

@ -484,6 +484,7 @@ private void surface_KeyUp(object sender, KeyEventArgs e)
break;
case Keys.Delete:
RemoveCurrentArea();
if (IsCreating)
{
EndRegionSelection();
@ -677,17 +678,6 @@ private void EndRegionSelection()
}
}
private void CancelRegionSelection()
{
BaseShape shape = AreaIntersect();
if (shape != null)
{
Shapes.Remove(shape);
DeselectArea();
}
}
private void AddRegionShape(Rectangle rect)
{
BaseShape shape = CreateRegionShape(rect);
@ -761,6 +751,17 @@ private void DeselectArea()
ResizeManager.Hide();
}
private void CancelRegionSelection()
{
BaseShape shape = AreaIntersect();
if (shape != null)
{
Shapes.Remove(shape);
DeselectArea();
}
}
private void RemoveCurrentArea()
{
BaseShape shape = CurrentShape;