diff --git a/src/Mod/Plot/InitGui.py b/src/Mod/Plot/InitGui.py index 8038c0319..59e65f8aa 100644 --- a/src/Mod/Plot/InitGui.py +++ b/src/Mod/Plot/InitGui.py @@ -43,6 +43,8 @@ try: import matplotlib Gui.addWorkbench(PlotWorkbench()) except ImportError: - msg = QtCore.QT_TRANSLATE_NOOP("plot", "matplotlib not found, Plot module will be disabled") + from PyQt4 import QtCore, QtGui + msg = QtGui.QApplication.translate("plot_console", "matplotlib not found, Plot module will be disabled", + None,QtGui.QApplication.UnicodeUTF8) FreeCAD.Console.PrintMessage(msg + '\n') diff --git a/src/Mod/Plot/Plot.py b/src/Mod/Plot/Plot.py index 29fdff663..59020ab22 100644 --- a/src/Mod/Plot/Plot.py +++ b/src/Mod/Plot/Plot.py @@ -35,7 +35,8 @@ try: from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg as NavigationToolbar from matplotlib.figure import Figure except ImportError: - msg = QtCore.QT_TRANSLATE_NOOP("plot", "matplotlib not found, so Plot module can not be loaded") + msg = QtGui.QApplication.translate("plot_console", "matplotlib not found, so Plot module can not be loaded", + None,QtGui.QApplication.UnicodeUTF8) FreeCAD.Console.PrintMessage(msg + '\n') raise ImportError("matplotlib not installed") diff --git a/src/Mod/Plot/PlotGui.py b/src/Mod/Plot/PlotGui.py index ad3b2da65..cd71de2ae 100644 --- a/src/Mod/Plot/PlotGui.py +++ b/src/Mod/Plot/PlotGui.py @@ -45,8 +45,8 @@ class Save: def GetResources(self): from plotUtils import Paths IconPath = Paths.iconsPath() + "/Save.svg" - MenuText = str(QtGui.QApplication.translate("plot", "Save plot").toAscii()) - ToolTip = str(QtGui.QApplication.translate("plot", "Save plot as image file").toAscii()) + MenuText = QtCore.QT_TRANSLATE_NOOP("plot", "Save plot") + ToolTip = QtCore.QT_TRANSLATE_NOOP("plot", "Save plot as image file") return {'Pixmap' : IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} class Axes: @@ -57,8 +57,8 @@ class Axes: def GetResources(self): from plotUtils import Paths IconPath = Paths.iconsPath() + "/Axes.svg" - MenuText = str(QtGui.QApplication.translate("plot", "Configure axes").toAscii()) - ToolTip = str(QtGui.QApplication.translate("plot", "Configure axes parameters").toAscii()) + MenuText = QtCore.QT_TRANSLATE_NOOP("plot", "Configure axes") + ToolTip = QtCore.QT_TRANSLATE_NOOP("plot", "Configure axes parameters") return {'Pixmap' : IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} class Series: @@ -69,8 +69,8 @@ class Series: def GetResources(self): from plotUtils import Paths IconPath = Paths.iconsPath() + "/Series.svg" - MenuText = str(QtGui.QApplication.translate("plot", "Configure series").toAscii()) - ToolTip = str(QtGui.QApplication.translate("plot", "Configure series drawing style and label").toAscii()) + MenuText = QtCore.QT_TRANSLATE_NOOP("plot", "Configure series") + ToolTip = QtCore.QT_TRANSLATE_NOOP("plot", "Configure series drawing style and label") return {'Pixmap' : IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} class Grid: @@ -78,7 +78,8 @@ class Grid: import Plot plt = Plot.getPlot() if not plt: - msg = str(QtGui.QApplication.translate("plot", "Grid must be activated on top of a plot document").toAscii()) + msg = QtGui.QApplication.translate("plot_console", "Grid must be activated on top of a plot document", + None,QtGui.QApplication.UnicodeUTF8) FreeCAD.Console.PrintError(msg+"\n") return flag = plt.isGrid() @@ -87,8 +88,8 @@ class Grid: def GetResources(self): from plotUtils import Paths IconPath = Paths.iconsPath() + "/Grid.svg" - MenuText = str(QtGui.QApplication.translate("plot", "Show/Hide grid").toAscii()) - ToolTip = str(QtGui.QApplication.translate("plot", "Show/Hide grid on selected plot").toAscii()) + MenuText = QtCore.QT_TRANSLATE_NOOP("plot", "Show/Hide grid") + ToolTip = QtCore.QT_TRANSLATE_NOOP("plot", "Show/Hide grid on selected plot") return {'Pixmap' : IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} class Legend: @@ -96,7 +97,8 @@ class Legend: import Plot plt = Plot.getPlot() if not plt: - msg = str(QtGui.QApplication.translate("plot", "Legend must be activated on top of a plot document").toAscii()) + msg = QtGui.QApplication.translate("plot_console", "Legend must be activated on top of a plot document", + None,QtGui.QApplication.UnicodeUTF8) FreeCAD.Console.PrintError(msg+"\n") return flag = plt.isLegend() @@ -105,8 +107,8 @@ class Legend: def GetResources(self): from plotUtils import Paths IconPath = Paths.iconsPath() + "/Legend.svg" - MenuText = str(QtGui.QApplication.translate("plot", "Show/Hide legend").toAscii()) - ToolTip = str(QtGui.QApplication.translate("plot", "Show/Hide legend on selected plot").toAscii()) + MenuText = QtCore.QT_TRANSLATE_NOOP("plot", "Show/Hide legend") + ToolTip = QtCore.QT_TRANSLATE_NOOP("plot", "Show/Hide legend on selected plot") return {'Pixmap' : IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} class Labels: @@ -117,8 +119,8 @@ class Labels: def GetResources(self): from plotUtils import Paths IconPath = Paths.iconsPath() + "/Labels.svg" - MenuText = str(QtGui.QApplication.translate("plot", "Set labels").toAscii()) - ToolTip = str(QtGui.QApplication.translate("plot", "Set title and axes labels").toAscii()) + MenuText = QtCore.QT_TRANSLATE_NOOP("plot", "Set labels") + ToolTip = QtCore.QT_TRANSLATE_NOOP("plot", "Set title and axes labels") return {'Pixmap' : IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} class Positions: @@ -129,8 +131,8 @@ class Positions: def GetResources(self): from plotUtils import Paths IconPath = Paths.iconsPath() + "/Positions.svg" - MenuText = str(QtGui.QApplication.translate("plot", "Set positions and sizes").toAscii()) - ToolTip = str(QtGui.QApplication.translate("plot", "Set labels and legend positions and sizes").toAscii()) + MenuText = QtCore.QT_TRANSLATE_NOOP("plot", "Set positions and sizes") + ToolTip = QtCore.QT_TRANSLATE_NOOP("plot", "Set labels and legend positions and sizes") return {'Pixmap' : IconPath, 'MenuText': MenuText, 'ToolTip': ToolTip} FreeCADGui.addCommand('Plot_SaveFig', Save()) diff --git a/src/Mod/Plot/plotAxes/TaskPanel.py b/src/Mod/Plot/plotAxes/TaskPanel.py index fc18dfd69..35e49a434 100644 --- a/src/Mod/Plot/plotAxes/TaskPanel.py +++ b/src/Mod/Plot/plotAxes/TaskPanel.py @@ -127,19 +127,32 @@ class TaskPanel: def retranslateUi(self): """ Set user interface locale strings. """ - self.form.setWindowTitle(str(QtGui.QApplication.translate("plot_axes", "Configure axes").toAscii())) - self.form.findChild(QtGui.QLabel, "axesLabel").setText(str(QtGui.QApplication.translate("plot_axes", "Active axes").toAscii())) - self.form.all.setText(str(QtGui.QApplication.translate("plot_axes", "Apply to all axes").toAscii())) - self.form.findChild(QtGui.QLabel, "dimLabel").setText(str(QtGui.QApplication.translate("plot_axes", "Dimensions").toAscii())) - self.form.findChild(QtGui.QLabel, "xPosLabel").setText(str(QtGui.QApplication.translate("plot_axes", "X axis position").toAscii())) - self.form.findChild(QtGui.QLabel, "yPosLabel").setText(str(QtGui.QApplication.translate("plot_axes", "Y axis position").toAscii())) - self.form.findChild(QtGui.QLabel, "scalesLabel").setText(str(QtGui.QApplication.translate("plot_axes", "Scales").toAscii())) - self.form.xAuto.setText(str(QtGui.QApplication.translate("plot_axes", "X auto").toAscii())) - self.form.yAuto.setText(str(QtGui.QApplication.translate("plot_axes", "Y auto").toAscii())) - self.form.findChild(QtGui.QCheckBox, "allAxes").setText(str(QtGui.QApplication.translate("plot_axes", "Apply to all axes").toAscii())) - self.form.findChild(QtGui.QLabel, "dimLabel").setText(str(QtGui.QApplication.translate("plot_axes", "Dimensions").toAscii())) - self.form.findChild(QtGui.QLabel, "xPosLabel").setText(str(QtGui.QApplication.translate("plot_axes", "X axis position").toAscii())) - self.form.findChild(QtGui.QLabel, "yPosLabel").setText(str(QtGui.QApplication.translate("plot_axes", "Y axis position").toAscii())) + self.form.setWindowTitle(QtGui.QApplication.translate("plot_axes", "Configure axes", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "axesLabel").setText(QtGui.QApplication.translate("plot_axes", "Active axes", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.all.setText(QtGui.QApplication.translate("plot_axes", "Apply to all axes", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "dimLabel").setText(QtGui.QApplication.translate("plot_axes", "Dimensions", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "xPosLabel").setText(QtGui.QApplication.translate("plot_axes", "X axis position", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "yPosLabel").setText(QtGui.QApplication.translate("plot_axes", "Y axis position", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "scalesLabel").setText(QtGui.QApplication.translate("plot_axes", "Scales", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.xAuto.setText(QtGui.QApplication.translate("plot_axes", "X auto", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.yAuto.setText(QtGui.QApplication.translate("plot_axes", "Y auto", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QCheckBox, "allAxes").setText(QtGui.QApplication.translate("plot_axes", "Apply to all axes", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "dimLabel").setText(QtGui.QApplication.translate("plot_axes", "Dimensions", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "xPosLabel").setText(QtGui.QApplication.translate("plot_axes", "X axis position", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "yPosLabel").setText(QtGui.QApplication.translate("plot_axes", "Y axis position", + None,QtGui.QApplication.UnicodeUTF8)) def onAxesId(self, value): """ Executed when axes index is modified. """ @@ -178,7 +191,8 @@ class TaskPanel: return # Don't remove first axes if not self.form.axId.value(): - msg = str(QtGui.QApplication.translate("plot_axes", "Axes 0 can not be deleted".toAscii())) + msg = QtGui.QApplication.translate("plot_console", "Axes 0 can not be deleted", + None,QtGui.QApplication.UnicodeUTF8) App.Console.PrintError(msg+"\n") return # Remove axes diff --git a/src/Mod/Plot/plotLabels/TaskPanel.py b/src/Mod/Plot/plotLabels/TaskPanel.py index b50262e61..db6150137 100644 --- a/src/Mod/Plot/plotLabels/TaskPanel.py +++ b/src/Mod/Plot/plotLabels/TaskPanel.py @@ -106,11 +106,16 @@ class TaskPanel: def retranslateUi(self): """ Set user interface locale strings. """ - self.form.setWindowTitle(str(QtGui.QApplication.translate("plot_labels", "Set labels").toAscii())) - self.form.findChild(QtGui.QLabel, "axesLabel").setText(str(QtGui.QApplication.translate("plot_labels", "Active axes").toAscii())) - self.form.findChild(QtGui.QLabel, "titleLabel").setText(str(QtGui.QApplication.translate("plot_labels", "Title").toAscii())) - self.form.findChild(QtGui.QLabel, "xLabel").setText(str(QtGui.QApplication.translate("plot_labels", "X label").toAscii())) - self.form.findChild(QtGui.QLabel, "yLabel").setText(str(QtGui.QApplication.translate("plot_labels", "Y label").toAscii())) + self.form.setWindowTitle(QtGui.QApplication.translate("plot_labels", "Set labels", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "axesLabel").setText(QtGui.QApplication.translate("plot_labels", "Active axes", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "titleLabel").setText(QtGui.QApplication.translate("plot_labels", "Title", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "xLabel").setText(QtGui.QApplication.translate("plot_labels", "X label", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "yLabel").setText(QtGui.QApplication.translate("plot_labels", "Y label", + None,QtGui.QApplication.UnicodeUTF8)) def onAxesId(self, value): """ Executed when axes index is modified. """ diff --git a/src/Mod/Plot/plotPositions/TaskPanel.py b/src/Mod/Plot/plotPositions/TaskPanel.py index bf409fdea..c32c6c6cd 100644 --- a/src/Mod/Plot/plotPositions/TaskPanel.py +++ b/src/Mod/Plot/plotPositions/TaskPanel.py @@ -97,9 +97,12 @@ class TaskPanel: def retranslateUi(self): """ Set user interface locale strings. """ - self.form.setWindowTitle(str(QtGui.QApplication.translate("plot_positions", "Set positions and sizes").toAscii())) - self.form.findChild(QtGui.QLabel, "posLabel").setText(str(QtGui.QApplication.translate("plot_positions", "Position").toAscii())) - self.form.findChild(QtGui.QLabel, "sizeLabel").setText(str(QtGui.QApplication.translate("plot_positions", "Size").toAscii())) + self.form.setWindowTitle(QtGui.QApplication.translate("plot_positions", "Set positions and sizes", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "posLabel").setText(QtGui.QApplication.translate("plot_positions", "Position", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "sizeLabel").setText(QtGui.QApplication.translate("plot_positions", "Size", + None,QtGui.QApplication.UnicodeUTF8)) def onItem(self, row): """ Executed when selected item is modified. """ diff --git a/src/Mod/Plot/plotSave/TaskPanel.py b/src/Mod/Plot/plotSave/TaskPanel.py index 051184710..2f3c65c46 100644 --- a/src/Mod/Plot/plotSave/TaskPanel.py +++ b/src/Mod/Plot/plotSave/TaskPanel.py @@ -38,7 +38,8 @@ class TaskPanel: def accept(self): plt = Plot.getPlot() if not plt: - msg = str(QtGui.QApplication.translate("plot_save", "Plot document must be selected in order to save it").toAscii()) + msg = QtGui.QApplication.translate("plot_console", "Plot document must be selected in order to save it", + None,QtGui.QApplication.UnicodeUTF8) App.Console.PrintError(msg+"\n") return False path = unicode(self.form.path.text()) @@ -102,9 +103,12 @@ class TaskPanel: def retranslateUi(self): """ Set user interface locale strings. """ - self.form.setWindowTitle(str(QtGui.QApplication.translate("plot_save", "Save figure").toAscii())) - self.form.findChild(QtGui.QLabel, "sizeLabel").setText(str(QtGui.QApplication.translate("plot_save", "Inches").toAscii())) - self.form.findChild(QtGui.QLabel, "dpiLabel").setText(str(QtGui.QApplication.translate("plot_save", "Dots per Inch").toAscii())) + self.form.setWindowTitle(QtGui.QApplication.translate("plot_save", "Save figure", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "sizeLabel").setText(QtGui.QApplication.translate("plot_save", "Inches", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "dpiLabel").setText(QtGui.QApplication.translate("plot_save", "Dots per Inch", + None,QtGui.QApplication.UnicodeUTF8)) def updateUI(self): """ Setup UI controls values if possible """ diff --git a/src/Mod/Plot/plotSeries/TaskPanel.py b/src/Mod/Plot/plotSeries/TaskPanel.py index 67b1950b4..c214efcdd 100644 --- a/src/Mod/Plot/plotSeries/TaskPanel.py +++ b/src/Mod/Plot/plotSeries/TaskPanel.py @@ -110,11 +110,16 @@ class TaskPanel: def retranslateUi(self): """ Set user interface locale strings. """ - self.form.setWindowTitle(str(QtGui.QApplication.translate("plot_series", "Configure series").toAscii())) - self.form.isLabel.setText(str(QtGui.QApplication.translate("plot_series", "No label").toAscii())) - self.form.remove.setText(str(QtGui.QApplication.translate("plot_series", "Remove serie").toAscii())) - self.form.findChild(QtGui.QLabel, "styleLabel").setText(str(QtGui.QApplication.translate("plot_series", "Line style").toAscii())) - self.form.findChild(QtGui.QLabel, "markerLabel").setText(str(QtGui.QApplication.translate("plot_series", "Marker").toAscii())) + self.form.setWindowTitle(QtGui.QApplication.translate("plot_series", "Configure series", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.isLabel.setText(QtGui.QApplication.translate("plot_series", "No label", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.remove.setText(QtGui.QApplication.translate("plot_series", "Remove serie", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "styleLabel").setText(QtGui.QApplication.translate("plot_series", "Line style", + None,QtGui.QApplication.UnicodeUTF8)) + self.form.findChild(QtGui.QLabel, "markerLabel").setText(QtGui.QApplication.translate("plot_series", "Marker", + None,QtGui.QApplication.UnicodeUTF8)) def fillStyles(self): """ Fill style combo boxes. """ diff --git a/src/Mod/Plot/resources/translations/Plot.ts b/src/Mod/Plot/resources/translations/Plot.ts index b74f108cd..e321cd435 100644 --- a/src/Mod/Plot/resources/translations/Plot.ts +++ b/src/Mod/Plot/resources/translations/Plot.ts @@ -28,70 +28,50 @@ - - Grid must be activated on top of a plot document - - - - + Show/Hide grid - + Show/Hide grid on selected plot - - Legend must be activated on top of a plot document - - - - + Show/Hide legend - + Show/Hide legend on selected plot - + Set labels - + Set title and axes labels - + Set positions and sizes - + Set labels and legend positions and sizes - - - matplotlib not found, Plot module will be disabled - - Save plot as image file - - - matplotlib not found, so Plot module can not be loaded - - plot_axes @@ -101,46 +81,79 @@ - + Active axes - + Apply to all axes - + Dimensions - + X axis position - + Y axis position - + Scales - + X auto - + Y auto + + plot_console + + + matplotlib not found, so Plot module can not be loaded + + + + + matplotlib not found, Plot module will be disabled + + + + + Plot document must be selected in order to save it + + + + + Axes 0 can not be deleted + + + + + Grid must be activated on top of a plot document + + + + + Legend must be activated on top of a plot document + + + plot_labels @@ -149,22 +162,22 @@ - + Active axes - + Title - + X label - + Y label @@ -177,12 +190,12 @@ - + Position - + Size @@ -190,45 +203,40 @@ plot_save - + Save figure - + Inches - + Dots per Inch - - - Plot document must be selected in order to save it - - plot_series - + No label - + Remove serie - + Line style - + Marker diff --git a/src/Mod/Plot/resources/translations/Plot_es-ES.qm b/src/Mod/Plot/resources/translations/Plot_es-ES.qm index ccb2cc5a9..cfc4d6a29 100644 Binary files a/src/Mod/Plot/resources/translations/Plot_es-ES.qm and b/src/Mod/Plot/resources/translations/Plot_es-ES.qm differ diff --git a/src/Mod/Plot/resources/translations/Plot_es-ES.ts b/src/Mod/Plot/resources/translations/Plot_es-ES.ts index 033a50621..00ef0c34b 100644 --- a/src/Mod/Plot/resources/translations/Plot_es-ES.ts +++ b/src/Mod/Plot/resources/translations/Plot_es-ES.ts @@ -2,11 +2,6 @@ plot - - - matplotlib not found, Plot module will be disabled - No se puede encontrar matplotlib, el modulo de graficado sera desactivado - Save plot @@ -38,60 +33,45 @@ Establezca el título y el estilo de las curvas trazadas - - Grid must be activated on top of a plot document - Para activar la malla se requiere un documento de grafica seleccionado - - - + Show/Hide grid Mostrar/Ocultar la malla - + Show/Hide grid on selected plot Muestre/Oculte la malla del gráfico seleccionado - - Legend must be activated on top of a plot document - Para activar la legenda se requiere un documento de grafica seleccionado - - - + Show/Hide legend Mostrar/Ocultar la legenda - + Show/Hide legend on selected plot Muestre/Oculte la legenda del gráfico seleccionado - + Set labels Establecer títulos - + Set title and axes labels Establezca los tñitulos de ejes y series de datos - + Set positions and sizes Modificar posiciones y tamaños - + Set labels and legend positions and sizes Modifique la posición y tamaño de títulos y legenda - - - matplotlib not found, so Plot module can not be loaded - No se puede encontrar matplotlib, y por tanto no se puede cargar el modulo de graficado - plot_axes @@ -101,44 +81,77 @@ Configuración de los ejes - + Active axes Ejes activos - + Apply to all axes Aplicar a todos los ejes - + Dimensions Dimensiones - + X axis position Posición del eje X - + Y axis position Posición del eje Y - + Scales Escalas - + X auto - Automatica en X + Automática en X - + Y auto - + Automática en Y + + + + plot_console + + + matplotlib not found, so Plot module can not be loaded + No se puede encontrar matplotlib, y por tanto no se puede cargar el modulo de graficado + + + + matplotlib not found, Plot module will be disabled + No se puede encontrar matplotlib, el modulo de graficado sera desactivado + + + + Plot document must be selected in order to save it + Debe seleccionar una grafica primero + + + + Axes 0 can not be deleted + El juego ejes 0 no puede ser eliminado + + + + Grid must be activated on top of a plot document + Para activar la malla seleccione primero una grafica + + + + Legend must be activated on top of a plot document + Para activar la legenda seleccione primero una grafica @@ -149,22 +162,22 @@ Selección de títulos - + Active axes Ejes activos - + Title Título - + X label Título del eje X - + Y label Título del eje Y @@ -177,12 +190,12 @@ Selección de posiciones y tamaños - + Position Posición - + Size Tamaño @@ -190,25 +203,20 @@ plot_save - + Save figure Guardar figura - + Inches Pulgadas - + Dots per Inch Puntos por pulgada - - - Plot document must be selected in order to save it - Debe seleccionar una grafica primero - plot_series @@ -218,22 +226,22 @@ Configurar series de datos - + No label Sin título - + Remove serie Eliminar serie - + Line style Estilo de línea - + Marker Marcador