bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added formatting for some strings in the app strings, making the future translations easier

Browse Source
This commit is contained in:
Marius Stanciu
2019-09-02 13:24:04 +03:00
parent 7827cbfe6c
commit 4b7115ca59
8 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
flatcamEditors/FlatCAMExcEditor.py
View File

@@ -1498,7 +1498,7 @@ class FlatCAMExcEditor(QtCore.QObject):
grid1 = QtWidgets.QGridLayout()
self.tools_box.addLayout(grid1)
addtool_entry_lbl = QtWidgets.QLabel(_('Tool Dia:'))
addtool_entry_lbl = QtWidgets.QLabel('%s:' % _('Tool Dia'))
addtool_entry_lbl.setToolTip(
_("Diameter for the new tool")
)
@@ -1551,7 +1551,7 @@ class FlatCAMExcEditor(QtCore.QObject):
grid3 = QtWidgets.QGridLayout()
self.resize_box.addLayout(grid3)
res_entry_lbl = QtWidgets.QLabel(_('Resize Dia:'))
res_entry_lbl = QtWidgets.QLabel('%s:' % _('Resize Dia'))
res_entry_lbl.setToolTip(
_("Diameter to resize to.")
)
@@ -1608,7 +1608,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.array_box.addLayout(self.array_form)
# Set the number of drill holes in the drill array
self.drill_array_size_label = QtWidgets.QLabel(_('Nr of drills:'))
self.drill_array_size_label = QtWidgets.QLabel('%s:' % _('Nr of drills'))
self.drill_array_size_label.setToolTip(_("Specify how many drills to be in the array."))
self.drill_array_size_label.setMinimumWidth(100)
@@ -1626,7 +1626,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.linear_box.addLayout(self.linear_form)
# Linear Drill Array direction
self.drill_axis_label = QtWidgets.QLabel(_('Direction:'))
self.drill_axis_label = QtWidgets.QLabel('%s:'% _('Direction'))
self.drill_axis_label.setToolTip(
_("Direction on which the linear array is oriented:\n"
"- 'X' - horizontal axis \n"
@@ -1641,7 +1641,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.linear_form.addRow(self.drill_axis_label, self.drill_axis_radio)
# Linear Drill Array pitch distance
self.drill_pitch_label = QtWidgets.QLabel(_('Pitch:'))
self.drill_pitch_label = QtWidgets.QLabel('%s:' % _('Pitch'))
self.drill_pitch_label.setToolTip(
_("Pitch = Distance between elements of the array.")
)
@@ -1651,7 +1651,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.linear_form.addRow(self.drill_pitch_label, self.drill_pitch_entry)
# Linear Drill Array angle
self.linear_angle_label = QtWidgets.QLabel(_('Angle:'))
self.linear_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.linear_angle_label.setToolTip(
_("Angle at which the linear array is placed.\n"
"The precision is of max 2 decimals.\n"
@@ -1673,7 +1673,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.circular_box.setContentsMargins(0, 0, 0, 0)
self.array_circular_frame.setLayout(self.circular_box)
self.drill_direction_label = QtWidgets.QLabel(_('Direction:'))
self.drill_direction_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.drill_direction_label.setToolTip(_("Direction for circular array."
"Can be CW = clockwise or CCW = counter clockwise."))
self.drill_direction_label.setMinimumWidth(100)
@@ -1685,7 +1685,7 @@ class FlatCAMExcEditor(QtCore.QObject):
{'label': _('CCW'), 'value': 'CCW'}])
self.circular_form.addRow(self.drill_direction_label, self.drill_direction_radio)
self.drill_angle_label = QtWidgets.QLabel(_('Angle:'))
self.drill_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.drill_angle_label.setToolTip(_("Angle at which each element in circular array is placed."))
self.drill_angle_label.setMinimumWidth(100)
@@ -1727,7 +1727,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_box.addLayout(self.slot_form)
# Slot length
self.slot_length_label = QtWidgets.QLabel(_('Length:'))
self.slot_length_label = QtWidgets.QLabel('%s:' % _('Length'))
self.slot_length_label.setToolTip(
_("Length = The length of the slot.")
)
@@ -1737,7 +1737,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_form.addRow(self.slot_length_label, self.slot_length_entry)
# Slot direction
self.slot_axis_label = QtWidgets.QLabel(_('Direction:'))
self.slot_axis_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.slot_axis_label.setToolTip(
_("Direction on which the slot is oriented:\n"
"- 'X' - horizontal axis \n"
@@ -1752,7 +1752,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_form.addRow(self.slot_axis_label, self.slot_axis_radio)
# Slot custom angle
self.slot_angle_label = QtWidgets.QLabel(_('Angle:'))
self.slot_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.slot_angle_label.setToolTip(
_("Angle at which the slot is placed.\n"
"The precision is of max 2 decimals.\n"
@@ -1810,7 +1810,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_box.addLayout(self.slot_array_form)
# Set the number of slot holes in the slot array
self.slot_array_size_label = QtWidgets.QLabel(_('Nr of slots:'))
self.slot_array_size_label = QtWidgets.QLabel('%s:' % _('Nr of slots'))
self.slot_array_size_label.setToolTip(_("Specify how many slots to be in the array."))
self.slot_array_size_label.setMinimumWidth(100)
@@ -1828,7 +1828,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_linear_box.addLayout(self.slot_array_linear_form)
# Linear Slot Array direction
self.slot_array_axis_label = QtWidgets.QLabel(_('Direction:'))
self.slot_array_axis_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.slot_array_axis_label.setToolTip(
_("Direction on which the linear array is oriented:\n"
"- 'X' - horizontal axis \n"
@@ -1843,7 +1843,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_linear_form.addRow(self.slot_array_axis_label, self.slot_array_axis_radio)
# Linear Slot Array pitch distance
self.slot_array_pitch_label = QtWidgets.QLabel(_('Pitch:'))
self.slot_array_pitch_label = QtWidgets.QLabel('%s:' % _('Pitch'))
self.slot_array_pitch_label.setToolTip(
_("Pitch = Distance between elements of the array.")
)
@@ -1853,7 +1853,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_linear_form.addRow(self.slot_array_pitch_label, self.slot_array_pitch_entry)
# Linear Slot Array angle
self.slot_array_linear_angle_label = QtWidgets.QLabel(_('Angle:'))
self.slot_array_linear_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.slot_array_linear_angle_label.setToolTip(
_("Angle at which the linear array is placed.\n"
"The precision is of max 2 decimals.\n"
@@ -1875,7 +1875,7 @@ class FlatCAMExcEditor(QtCore.QObject):
self.slot_array_circular_box.setContentsMargins(0, 0, 0, 0)
self.slot_array_circular_frame.setLayout(self.slot_array_circular_box)
self.slot_array_direction_label = QtWidgets.QLabel(_('Direction:'))
self.slot_array_direction_label = QtWidgets.QLabel('%s:' % _('Direction'))
self.slot_array_direction_label.setToolTip(_("Direction for circular array."
"Can be CW = clockwise or CCW = counter clockwise."))
self.slot_array_direction_label.setMinimumWidth(100)
@@ -1887,7 +1887,7 @@ class FlatCAMExcEditor(QtCore.QObject):
{'label': _('CCW'), 'value': 'CCW'}])
self.slot_array_circular_form.addRow(self.slot_array_direction_label, self.slot_array_direction_radio)
self.slot_array_angle_label = QtWidgets.QLabel(_('Angle:'))
self.slot_array_angle_label = QtWidgets.QLabel('%s:' % _('Angle'))
self.slot_array_angle_label.setToolTip(_("Angle at which each element in circular array is placed."))
self.slot_array_angle_label.setMinimumWidth(100)

18
flatcamEditors/FlatCAMGeoEditor.py
View File

@@ -431,7 +431,7 @@ class PaintOptionsTool(FlatCAMTool):
self.layout.addLayout(grid)
# Tool dia
ptdlabel = QtWidgets.QLabel(_('Tool dia:'))
ptdlabel = QtWidgets.QLabel('%s:' % _('Tool dia'))
ptdlabel.setToolTip(
_("Diameter of the tool to\n"
"be used in the operation.")
@@ -442,7 +442,7 @@ class PaintOptionsTool(FlatCAMTool):
grid.addWidget(self.painttooldia_entry, 0, 1)
# Overlap
ovlabel = QtWidgets.QLabel(_('Overlap Rate:'))
ovlabel = QtWidgets.QLabel('%s:' % _('Overlap Rate'))
ovlabel.setToolTip(
_("How much (fraction) of the tool width to overlap each tool pass.\n"
"Example:\n"
@@ -460,7 +460,7 @@ class PaintOptionsTool(FlatCAMTool):
grid.addWidget(self.paintoverlap_entry, 1, 1)
# Margin
marginlabel = QtWidgets.QLabel(_('Margin:'))
marginlabel = QtWidgets.QLabel('%s:' % _('Margin'))
marginlabel.setToolTip(
_("Distance by which to avoid\n"
"the edges of the polygon to\n"
@@ -471,7 +471,7 @@ class PaintOptionsTool(FlatCAMTool):
grid.addWidget(self.paintmargin_entry, 2, 1)
# Method
methodlabel = QtWidgets.QLabel(_('Method:'))
methodlabel = QtWidgets.QLabel('%s:' % _('Method'))
methodlabel.setToolTip(
_("Algorithm to paint the polygon:<BR>"
"<B>Standard</B>: Fixed step inwards.<BR>"
@@ -1477,7 +1477,7 @@ class TransformEditorTool(FlatCAMTool):
def on_rotate_key(self):
val_box = FCInputDialog(title=_("Rotate ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_rotate']))
val_box.setWindowIcon(QtGui.QIcon('share/rotate.png'))
@@ -1498,7 +1498,7 @@ class TransformEditorTool(FlatCAMTool):
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title=_("Offset on X axis ..."),
text=(_('Enter a distance Value (%s):') % str(units)),
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
min=-9999.9999, max=10000.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_offset_x']))
val_box.setWindowIcon(QtGui.QIcon('share/offsetx32.png'))
@@ -1517,7 +1517,7 @@ class TransformEditorTool(FlatCAMTool):
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title=_("Offset on Y axis ..."),
text=(_('Enter a distance Value (%s):') % str(units)),
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
min=-9999.9999, max=10000.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_offset_y']))
val_box.setWindowIcon(QtGui.QIcon('share/offsety32.png'))
@@ -1534,7 +1534,7 @@ class TransformEditorTool(FlatCAMTool):
def on_skewx_key(self):
val_box = FCInputDialog(title=_("Skew on X axis ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_skew_x']))
val_box.setWindowIcon(QtGui.QIcon('share/skewX.png'))
@@ -1551,7 +1551,7 @@ class TransformEditorTool(FlatCAMTool):
def on_skewy_key(self):
val_box = FCInputDialog(title=_("Skew on Y axis ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_skew_y']))
val_box.setWindowIcon(QtGui.QIcon('share/skewY.png'))

14
flatcamEditors/FlatCAMGrbEditor.py
View File

@@ -2448,7 +2448,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.apdim_entry = EvalEntry2()
grid1.addWidget(self.apdim_entry, 4, 1)
apadd_del_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Add/Delete Aperture:'))
apadd_del_lbl = QtWidgets.QLabel('<b>%s:</b>' % _('Add/Delete Aperture'))
apadd_del_lbl.setToolTip(
_("Add/Delete an aperture in the aperture table")
)
@@ -2481,7 +2481,7 @@ class FlatCAMGrbEditor(QtCore.QObject):
self.buffer_tool_frame.hide()
# Title
buf_title_lbl = QtWidgets.QLabel('<b>%s</b>' % _('Buffer Aperture:'))
buf_title_lbl = QtWidgets.QLabel('<b>%s:</b>' % _('Buffer Aperture'))
buf_title_lbl.setToolTip(
_("Buffer a aperture in the aperture list")
)
@@ -5748,7 +5748,7 @@ class TransformEditorTool(FlatCAMTool):
def on_rotate_key(self):
val_box = FCInputDialog(title=_("Rotate ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_rotate']))
val_box.setWindowIcon(QtGui.QIcon('share/rotate.png'))
@@ -5769,7 +5769,7 @@ class TransformEditorTool(FlatCAMTool):
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title=_("Offset on X axis ..."),
text=(_('Enter a distance Value (%s):') % str(units)),
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
min=-9999.9999, max=10000.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_offset_x']))
val_box.setWindowIcon(QtGui.QIcon('share/offsetx32.png'))
@@ -5788,7 +5788,7 @@ class TransformEditorTool(FlatCAMTool):
units = self.app.ui.general_defaults_form.general_app_group.units_radio.get_value().lower()
val_box = FCInputDialog(title=_("Offset on Y axis ..."),
text=(_('Enter a distance Value (%s):') % str(units)),
text='%s: (%s)' % (_('Enter a distance Value'), str(units)),
min=-9999.9999, max=10000.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_offset_y']))
val_box.setWindowIcon(QtGui.QIcon('share/offsety32.png'))
@@ -5805,7 +5805,7 @@ class TransformEditorTool(FlatCAMTool):
def on_skewx_key(self):
val_box = FCInputDialog(title=_("Skew on X axis ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_skew_x']))
val_box.setWindowIcon(QtGui.QIcon('share/skewX.png'))
@@ -5822,7 +5822,7 @@ class TransformEditorTool(FlatCAMTool):
def on_skewy_key(self):
val_box = FCInputDialog(title=_("Skew on Y axis ..."),
text=_('Enter an Angle Value (degrees):'),
text='%s:' % _('Enter an Angle Value (degrees)'),
min=-359.9999, max=360.0000, decimals=4,
init_val=float(self.app.defaults['tools_transform_skew_y']))
val_box.setWindowIcon(QtGui.QIcon('share/skewY.png'))