jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add brackets to the phrase you want to translate

Browse source
This commit is contained in:
Solitarily 2017-12-01 22:45:40 +08:00
parent 6cd0ce5024
commit a8ac1bbba5
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/emc/usr_intf/gscreen/gscreen.py
View file

@ -1243,7 +1243,7 @@ class Gscreen:
expects widget to be named statusbar1 expects widget to be named statusbar1
""" """
self.statusbar_id = self.widgets.statusbar1.get_context_id("Statusbar1") self.statusbar_id = self.widgets.statusbar1.get_context_id("Statusbar1")
self.homed_status_message = self.widgets.statusbar1.push(1,"Ready For Homing") self.homed_status_message = self.widgets.statusbar1.push(1,_("Ready For Homing"))
def init_entry(self): def init_entry(self):
return return
@ -1307,7 +1307,7 @@ class Gscreen:
model.append((_("Follow System Theme"),)) model.append((_("Follow System Theme"),))
# if there is a local custom theme add it # if there is a local custom theme add it
if self.data.local_theme: if self.data.local_theme:
model.append(("Local Config Theme",)) model.append((_("Local Config Theme"),))
themes = [] themes = []
# add user themes # add user themes
if os.path.exists(userthemedir): if os.path.exists(userthemedir):
@ -4542,7 +4542,7 @@ class Gscreen:
systemlabel = (_("Machine"),"G54","G55","G56","G57","G58","G59","G59.1","G59.2","G59.3") systemlabel = (_("Machine"),"G54","G55","G56","G57","G58","G59","G59.1","G59.2","G59.3")
tool = str(self.data.tool_in_spindle) tool = str(self.data.tool_in_spindle)
if tool == None: tool = "None" if tool == None: tool = "None"
self.widgets.system.set_text(("Tool %s %s"%(tool,systemlabel[self.data.system]))) self.widgets.system.set_text((_("Tool %s %s")%(tool,systemlabel[self.data.system])))
def update_coolant_leds(self): def update_coolant_leds(self):
# coolant # coolant
@ -4571,12 +4571,12 @@ class Gscreen:
def update_jog_rate_label(self): def update_jog_rate_label(self):
rate = round(self.status.convert_units(self.data.jog_rate),2) rate = round(self.status.convert_units(self.data.jog_rate),2)
if self.data.dro_units == self.data._MM: if self.data.dro_units == self.data._MM:
text = "%4.2f mm/min"% (rate) text = _("%4.2f mm/min")% (rate)
else: else:
text = "%3.2f IPM"% (rate) text = _("%3.2f IPM")% (rate)
self.widgets.jog_rate.set_text(text) self.widgets.jog_rate.set_text(text)
try: try:
text = "%4.2f DPM"% (self.data.angular_jog_rate) text = _("%4.2f DPM")% (self.data.angular_jog_rate)
self.widgets.angular_jog_rate.set_text(text) self.widgets.angular_jog_rate.set_text(text)
except: except:
pass pass

2
src/emc/usr_intf/pncconf/pncconf.py
View file

@ -2233,7 +2233,7 @@ PNCconf will use internal firmware data"%self._p.FIRMDIR),True)
data2 = prefs.getpref('gtk_theme', 'Follow System Theme', str) data2 = prefs.getpref('gtk_theme', 'Follow System Theme', str)
model = self.widgets.themestore model = self.widgets.themestore
model.clear() model.clear()
model.append(("Follow System Theme",)) model.append((_("Follow System Theme"),))
temp1 = temp2 = 0 temp1 = temp2 = 0
names = os.listdir(_PD.THEMEDIR) names = os.listdir(_PD.THEMEDIR)
names.sort() names.sort()

6
src/emc/usr_intf/touchy/touchy.glade
View file

@ -657,7 +657,7 @@
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
<child> <child>
<widget class="GtkButton" id="set_tool"> <widget class="GtkButton" id="set_tool">
<property name="label">Set Tool</property> <property name="label" translatable="yes">Set Tool</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -672,7 +672,7 @@
</child> </child>
<child> <child>
<widget class="GtkButton" id="set_origin"> <widget class="GtkButton" id="set_origin">
<property name="label">Set Origin</property> <property name="label" translatable="yes">Set Origin</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
@ -687,7 +687,7 @@
</child> </child>
<child> <child>
<widget class="GtkButton" id="macro"> <widget class="GtkButton" id="macro">
<property name="label">Macro</property> <property name="label" translatable="yes">Macro</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>

2
src/emc/usr_intf/touchy/touchy.py
View file

@ -142,7 +142,7 @@ class touchy:
if os.path.exists(themedir): if os.path.exists(themedir):
model = self.wTree.get_widget("theme_choice").get_model() model = self.wTree.get_widget("theme_choice").get_model()
model.clear() model.clear()
model.append(("Follow System Theme",)) model.append((_("Follow System Theme"),))
temp = 0 temp = 0
names = os.listdir(themedir) names = os.listdir(themedir)
names.sort() names.sort()