kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Arch: translation fixes

Browse Source 
Adding Arch WB translation string corrections/refinements
This commit is contained in:
luz.paz
2018-04-14 14:10:57 -04:00
committed by Yorik van Havre
parent 75c2f9ddbf
commit 1d04002c3b
12 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Arch/ArchAxis.py
View File

@@ -907,7 +907,7 @@ class ArchGrid:
rowsizes = []
if obj.AutoHeight.Value:
if obj.AutoHeight.Value > obj.Height.Value:
FreeCAD.Console.PrintError(translate("Arch","Auto height is bigger than height"))
FreeCAD.Console.PrintError(translate("Arch","Auto height is larger than height"))
return [],[],[]
rows = int(math.floor(obj.Height.Value/obj.AutoHeight.Value))
for i in range(rows):
@@ -916,7 +916,7 @@ class ArchGrid:
else:
reserved_rowsize = sum(v for v in obj.RowSize)
if reserved_rowsize > obj.Height.Value:
FreeCAD.Console.PrintError(translate("Arch","Total row size is bigger than height"))
FreeCAD.Console.PrintError(translate("Arch","Total row size is larger than height"))
return [],[],[]
for i in range(obj.Rows):
v = 0
@@ -938,7 +938,7 @@ class ArchGrid:
columnsizes = []
if obj.AutoWidth.Value:
if obj.AutoWidth.Value > obj.Width.Value:
FreeCAD.Console.PrintError(translate("Arch","Auto width is bigger than width"))
FreeCAD.Console.PrintError(translate("Arch","Auto width is larger than width"))
return [],[],[]
cols = int(math.floor(obj.Width.Value/obj.AutoWidth.Value))
for i in range(cols):
@@ -947,7 +947,7 @@ class ArchGrid:
else:
reserved_columnsize = sum(v for v in obj.ColumnSize)
if reserved_columnsize > obj.Width.Value:
FreeCAD.Console.PrintError(translate("Arch","Total column size is bigger than width"))
FreeCAD.Console.PrintError(translate("Arch","Total column size is larger than width"))
return [],[],[]
for i in range(obj.Columns):
v = 0
@@ -1162,9 +1162,9 @@ class ArchGridTaskPanel:
self.wLabel.setText(QtGui.QApplication.translate("Arch", "Total width", None))
self.hLabel.setText(QtGui.QApplication.translate("Arch", "Total height", None))
self.addRowButton.setText(QtGui.QApplication.translate("Arch", "Add row", None))
self.delRowButton.setText(QtGui.QApplication.translate("Arch", "Del row", None))
self.addColumnButton.setText(QtGui.QApplication.translate("Arch", "Add col", None))
self.delColumnButton.setText(QtGui.QApplication.translate("Arch", "Del col", None))
self.delRowButton.setText(QtGui.QApplication.translate("Arch", "Delete row", None))
self.addColumnButton.setText(QtGui.QApplication.translate("Arch", "Add column", None))
self.delColumnButton.setText(QtGui.QApplication.translate("Arch", "Delete column", None))
self.spanButton.setText(QtGui.QApplication.translate("Arch", "Create span", None))
self.delSpanButton.setText(QtGui.QApplication.translate("Arch", "Remove span", None))
self.title.setText(QtGui.QApplication.translate("Arch", "Rows", None)+": "+str(self.table.rowCount())+" / "+QtGui.QApplication.translate("Arch", "Columns", None)+": "+str(self.table.columnCount()))

2
src/Mod/Arch/ArchComponent.py
View File

@@ -938,7 +938,7 @@ class ArchSelectionObserver:
del FreeCAD.ArchObserver
elif object == self.watched.Name:
if not element:
FreeCAD.Console.PrintMessage(translate("Arch","closing Sketch edit"))
FreeCAD.Console.PrintMessage(translate("Arch","Closing Sketch edit"))
if self.hide:
if self.origin:
self.origin.ViewObject.Transparency = 0

2
src/Mod/Arch/ArchEquipment.py
View File

@@ -261,7 +261,7 @@ class _Equipment(ArchComponent.Component):
def __init__(self,obj):
ArchComponent.Component.__init__(self,obj)
obj.addProperty("App::PropertyString","Model","Arch",QT_TRANSLATE_NOOP("App::Property","The model description of this equipment"))
obj.addProperty("App::PropertyString","ProductURL","Arch",QT_TRANSLATE_NOOP("App::Property","The url of the product page of this equipment"))
obj.addProperty("App::PropertyString","ProductURL","Arch",QT_TRANSLATE_NOOP("App::Property","The URL of the product page of this equipment"))
obj.addProperty("App::PropertyString","StandardCode","Arch",QT_TRANSLATE_NOOP("App::Property","A standard code (MasterFormat, OmniClass,...)"))
obj.addProperty("App::PropertyVectorList","SnapPoints","Arch",QT_TRANSLATE_NOOP("App::Property","Additional snap points for this equipment"))
obj.addProperty("App::PropertyFloat","EquipmentPower","Arch",QT_TRANSLATE_NOOP("App::Property","The electric power needed by this equipment in Watts"))

2
src/Mod/Arch/ArchMaterial.py
View File

@@ -181,7 +181,7 @@ class _ArchMaterial:
obj.Proxy = self
obj.addProperty("App::PropertyString","Description","Arch",QT_TRANSLATE_NOOP("App::Property","A description for this material"))
obj.addProperty("App::PropertyString","StandardCode","Arch",QT_TRANSLATE_NOOP("App::Property","A standard code (MasterFormat, OmniClass,...)"))
obj.addProperty("App::PropertyString","ProductURL","Arch",QT_TRANSLATE_NOOP("App::Property","An URL where to find information about this material"))
obj.addProperty("App::PropertyString","ProductURL","Arch",QT_TRANSLATE_NOOP("App::Property","A URL where to find information about this material"))
obj.addProperty("App::PropertyPercent","Transparency","Arch",QT_TRANSLATE_NOOP("App::Property","The transparency value of this material"))
obj.addProperty("App::PropertyColor","Color","Arch",QT_TRANSLATE_NOOP("App::Property","The color of this material"))

2
src/Mod/Arch/ArchPipe.py
View File

@@ -385,7 +385,7 @@ class _ArchPipeConnector(ArchComponent.Component):
elif round(v2.getAngle(v3),tol) in [0,round(math.pi,tol)]:
pair = [v2,v3,v1]
else:
FreeCAD.Console.PrintError(translate("Arch","At least 2 pipes must aligned")+"\n")
FreeCAD.Console.PrintError(translate("Arch","At least 2 pipes must align")+"\n")
return
offset = obj.Radius.Value
v1.multiply(offset)

4
src/Mod/Arch/ArchSite.py
View File

@@ -310,7 +310,7 @@ class _Site(ArchFloor._Floor):
ArchFloor._Floor.__init__(self,obj)
obj.addProperty("App::PropertyLink","Terrain","Arch",QT_TRANSLATE_NOOP("App::Property","The base terrain of this site"))
obj.addProperty("App::PropertyString","Address","Arch",QT_TRANSLATE_NOOP("App::Property","The street and housenumber of this site"))
obj.addProperty("App::PropertyString","Address","Arch",QT_TRANSLATE_NOOP("App::Property","The street and house number of this site"))
obj.addProperty("App::PropertyString","PostalCode","Arch",QT_TRANSLATE_NOOP("App::Property","The postal or zip code of this site"))
obj.addProperty("App::PropertyString","City","Arch",QT_TRANSLATE_NOOP("App::Property","The city of this site"))
obj.addProperty("App::PropertyString","Country","Arch",QT_TRANSLATE_NOOP("App::Property","The country of this site"))
@@ -318,7 +318,7 @@ class _Site(ArchFloor._Floor):
obj.addProperty("App::PropertyFloat","Longitude","Arch",QT_TRANSLATE_NOOP("App::Property","The latitude of this site"))
obj.addProperty("App::PropertyAngle","NorthDeviation","Arch",QT_TRANSLATE_NOOP("App::Property","Angle between the true North and the North direction in this document"))
obj.addProperty("App::PropertyLength","Elevation","Arch",QT_TRANSLATE_NOOP("App::Property","The elevation of level 0 of this site"))
obj.addProperty("App::PropertyString","Url","Arch",QT_TRANSLATE_NOOP("App::Property","An url that shows this site in a mapping website"))
obj.addProperty("App::PropertyString","Url","Arch",QT_TRANSLATE_NOOP("App::Property","A url that shows this site in a mapping website"))
obj.addProperty("App::PropertyLinkList","Additions","Arch",QT_TRANSLATE_NOOP("App::Property","Other shapes that are appended to this object"))
obj.addProperty("App::PropertyLinkList","Subtractions","Arch",QT_TRANSLATE_NOOP("App::Property","Other shapes that are subtracted from this object"))
obj.addProperty("App::PropertyArea","ProjectedArea","Arch",QT_TRANSLATE_NOOP("App::Property","The area of the projection of this object onto the XY plane"))

16
src/Mod/Arch/ArchWindow.py
View File

@@ -628,19 +628,19 @@ class _Window(ArchComponent.Component):
def __init__(self,obj):
ArchComponent.Component.__init__(self,obj)
obj.addProperty("App::PropertyLinkList","Hosts","Arch",QT_TRANSLATE_NOOP("App::Property","The objects that host this window"))
obj.addProperty("App::PropertyStringList","WindowParts","Arch",QT_TRANSLATE_NOOP("App::Property","the components of this window"))
obj.addProperty("App::PropertyLength","WindowParts","Arch",QT_TRANSLATE_NOOP("App::Property","the components of this window"))
obj.addProperty("App::PropertyLength","HoleDepth","Arch",QT_TRANSLATE_NOOP("App::Property","The depth of the hole that this window makes in its host object. Keep 0 for automatic."))
obj.addProperty("App::PropertyLink","Subvolume","Arch",QT_TRANSLATE_NOOP("App::Property","an optional object that defines a volume to be subtracted from hosts of this window"))
obj.addProperty("App::PropertyStringList","WindowParts","Arch",QT_TRANSLATE_NOOP("App::Property","The components of this window"))
obj.addProperty("App::PropertyLength","WindowParts","Arch",QT_TRANSLATE_NOOP("App::Property","The components of this window"))
obj.addProperty("App::PropertyLength","HoleDepth","Arch",QT_TRANSLATE_NOOP("App::Property","The depth of the hole that this window makes in its host object. If 0, the value will be calculated automatically."))
obj.addProperty("App::PropertyLink","Subvolume","Arch",QT_TRANSLATE_NOOP("App::Property","An optional object that defines a volume to be subtracted from hosts of this window"))
obj.addProperty("App::PropertyLength","Width","Arch",QT_TRANSLATE_NOOP("App::Property","The width of this window (for preset windows only)"))
obj.addProperty("App::PropertyLength","Height","Arch",QT_TRANSLATE_NOOP("App::Property","The height of this window (for preset windows only)"))
obj.addProperty("App::PropertyVector","Normal","Arch",QT_TRANSLATE_NOOP("App::Property","The normal direction of this window"))
obj.addProperty("App::PropertyInteger","Preset","Arch","")
obj.addProperty("App::PropertyArea","Area","Arch",QT_TRANSLATE_NOOP("App::Property","The area of this window"))
obj.addProperty("App::PropertyLength","LouvreWidth","Louvres",QT_TRANSLATE_NOOP("App::Property","the width of louvre elements"))
obj.addProperty("App::PropertyLength","LouvreSpacing","Louvres",QT_TRANSLATE_NOOP("App::Property","the space between louvre elements"))
obj.addProperty("App::PropertyLength","LouvreWidth","Louvres",QT_TRANSLATE_NOOP("App::Property","The width of louvre elements"))
obj.addProperty("App::PropertyLength","LouvreSpacing","Louvres",QT_TRANSLATE_NOOP("App::Property","The space between louvre elements"))
obj.addProperty("App::PropertyPercent","Opening","Arch",QT_TRANSLATE_NOOP("App::Property","Opens the subcomponents that have a hinge defined"))
obj.addProperty("App::PropertyInteger","HoleWire","Arch",QT_TRANSLATE_NOOP("App::Property","The number of the wire that defines the hole. A value of 0 means automatic"))
obj.addProperty("App::PropertyInteger","HoleWire","Arch",QT_TRANSLATE_NOOP("App::Property","The number of the wire that defines the hole. If 0, the value will be calculated automatically"))
obj.addProperty("App::PropertyBool","SymbolPlan","Arch",QT_TRANSLATE_NOOP("App::Property","Shows plan opening symbols if available"))
obj.addProperty("App::PropertyBool","SymbolElevation","Arch",QT_TRANSLATE_NOOP("App::Property","Show elevation opening symbols if available"))
obj.setEditorMode("Preset",2)
@@ -1519,7 +1519,7 @@ class _ArchWindowTaskPanel:
def retranslateUi(self, TaskPanel):
TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Window elements", None))
self.holeLabel.setText(QtGui.QApplication.translate("Arch", "Hole wire", None))
self.holeNumber.setToolTip(QtGui.QApplication.translate("Arch", "The number of the wire that defines a hole in the host object. A value of zero will adopt automatically the biggest wire", None))
self.holeNumber.setToolTip(QtGui.QApplication.translate("Arch", "The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire", None))
self.holeButton.setText(QtGui.QApplication.translate("Arch", "Pick selected", None))
self.delButton.setText(QtGui.QApplication.translate("Arch", "Remove", None))
self.addButton.setText(QtGui.QApplication.translate("Arch", "Add", None))

2
src/Mod/Arch/Resources/ui/ArchMultiMaterial.ui
View File

@@ -79,7 +79,7 @@
<item>
<widget class="QPushButton" name="delButton">
<property name="text">
<string>Del</string>
<string>Delete</string>
</property>
</widget>
</item>

5
src/Mod/Arch/Resources/ui/ArchSchedule.ui
View File

@@ -96,7 +96,7 @@
<string>Deletes the selected line</string>
</property>
<property name="text">
<string>Del</string>
<string>Delete</string>
</property>
<property name="icon">
<iconset theme="remove">
@@ -152,7 +152,8 @@
<item>
<widget class="QPushButton" name="buttonExport">
<property name="toolTip">
<string>This exports the contents of the &quot;Result&quot; spreadsheet to a csv file. In Libreoffice, you can keep this csv file linked by right-clicking the sheets tab bar -&gt; New sheet -&gt; From file -&gt; Link</string>
<string>This exports the contents of the &quot;Result&quot; spreadsheet to a CSV file. In Libreoffice, you can keep this CSV file linked by right-clicking the Sheets tab bar -&gt; New sheet -&gt; From file -&gt; Link
Note: as of LibreOffice v5.4.5.1 the correct path now is: Sheets tab bar -&gt; Insert Sheet... -&gt; From file -&gt; Browse...</string>
</property>
<property name="text">
<string>Export</string>

2
src/Mod/Arch/Resources/ui/preferences-arch.ui
View File

@@ -510,7 +510,7 @@
<item>
<widget class="Gui::PrefCheckBox" name="checkBox_3">
<property name="toolTip">
<string>If this is checked, the &quot;open BimServer in browser&quot; button will open the Bim Server interface in an external browser instead of the FreeCAD web workbench</string>
<string>If this is checked, the &quot;Open BimServer in browser&quot; button will open the Bim Server interface in an external browser instead of the FreeCAD web workbench</string>
</property>
<property name="text">
<string>Open in external browser</string>

2
src/Mod/Arch/importJSON.py
View File

@@ -55,7 +55,7 @@ def export(exportList, filename):
# Success
FreeCAD.Console.PrintMessage(
translate("Arch", "successfully written") + ' ' + filename + "\n")
translate("Arch", "Successfully written") + ' ' + filename + "\n")
def getObjectData(obj):

4
src/Mod/Arch/importOBJ.py
View File

@@ -185,7 +185,7 @@ def export(exportList,filename):
for f in flist:
outfile.write("f" + f + "\n")
outfile.close()
FreeCAD.Console.PrintMessage(translate("Arch","successfully written ").decode('utf8') + filename + "\n")
FreeCAD.Console.PrintMessage(translate("Arch","Successfully written ").decode('utf8') + filename + "\n")
if materials:
outfile = pythonopen(filenamemtl,"wb")
outfile.write("# FreeCAD v" + ver[0] + "." + ver[1] + " build" + ver[2] + " Arch module\n")
@@ -208,7 +208,7 @@ def export(exportList,filename):
done.append(mat.Name)
outfile.write("# Material Count: " + str(len(materials)))
outfile.close()
FreeCAD.Console.PrintMessage(translate("Arch","successfully written") + ' ' + filenamemtl + "\n")
FreeCAD.Console.PrintMessage(translate("Arch","Successfully written") + ' ' + filenamemtl + "\n")
def decode(name):