diff --git a/src/Gui/Language/FreeCAD.ts b/src/Gui/Language/FreeCAD.ts index 756d65a69f68..72cfd9200d7b 100644 --- a/src/Gui/Language/FreeCAD.ts +++ b/src/Gui/Language/FreeCAD.ts @@ -126,10 +126,6 @@ Spaceball Motion - - Global Sensitivity: - - Dominant Mode @@ -162,6 +158,10 @@ Reverse + + Global Sensitivity: + + DlgExpressionInput @@ -294,11 +294,11 @@ - Press middle and left or right mouse button + Press middle+left or middle+right button - Scroll middle mouse button or keep middle button pressed + Scroll middle mouse button or keep middle button depressed while doing a left or right click and move the mouse up or down @@ -398,6 +398,21 @@ while doing a left or right click and move the mouse up or down + + Gui::Dialog::AboutDialog + + Libraries + + + + This software uses open source components whose copyright and other proprietary rights belong to their respective owners: + + + + License + + + Gui::Dialog::ButtonModel @@ -409,6 +424,37 @@ while doing a left or right click and move the mouse up or down + + Gui::Dialog::CameraDialog + + Camera settings + + + + Orientation + + + + Q0 + + + + Q1 + + + + Q2 + + + + Q3 + + + + Current view + + + Gui::Dialog::Clipping @@ -803,17 +849,19 @@ while doing a left or right click and move the mouse up or down - The shortcut '%1' is defined more than once. This could result into unexpected behaviour. + Already defined shortcut - Already defined shortcut + The shortcut '%1' is defined more than once. This could result in unexpected behaviour. - The shortcut '%1' is already assigned to '%2'. - -Please define another shortcut. + The shortcut '%1' is already assigned to '%2'. + + + + Do you want to override it? @@ -1335,6 +1383,14 @@ Please define another shortcut. Rename + + Duplicate + + + + Addons... + + Gui::Dialog::DlgMacroExecuteImp @@ -1398,6 +1454,19 @@ This file already exists. Failed to rename to '%1'. +Perhaps a file permission error? + + + + Duplicate Macro + + + + Duplicate Failed + + + + Failed to duplicate to '%1'. Perhaps a file permission error? @@ -1973,7 +2042,51 @@ Specify another directory, please. - Use OpenGL Vertex Buffer Object (experimental) + Show navigation cube + + + + Corner + + + + Top left + + + + Top right + + + + Bottom left + + + + Bottom right + + + + Use OpenGL Vertex Buffer Object + + + + New Document Camera Orientation + + + + Prevents view tilting when pinch-zooming. Affects only Gesture nav. style. Mouse tilting is not disabled by this setting. + + + + Disable touchscreen tilt gesture + + + + Drag at cursor + + + + Marker size: @@ -1987,6 +2100,70 @@ Specify another directory, please. Open a new viewer or restart %1 to apply anti-aliasing changes. + + 5px + + + + 7px + + + + 9px + + + + 11px + + + + 13px + + + + 15px + + + + Isometric + + + + Dimetric + + + + Trimetric + + + + Top + + + + Front + + + + Left + + + + Right + + + + Rear + + + + Bottom + + + + Custom + + Gui::Dialog::DlgSettingsColorGradient @@ -2613,6 +2790,46 @@ Specify another directory, please. Metric small parts & CNC(mm, mm/min) + + Imperial Civil (ft/ft^2/ft^3) + + + + Minimum fractional inch: + + + + <html><head/><body><p>Minimum fractional inch to display.</p></body></html> + + + + 1/2" + + + + 1/4" + + + + 1/8" + + + + 1/16" + + + + 1/32" + + + + 1/64" + + + + 1/128" + + Gui::Dialog::DlgSettingsViewColor @@ -2653,7 +2870,19 @@ Specify another directory, please. - Sets the area of confusion for picking elements in 3D view. Larger value make it easier to pick stuff, but will make some small features impossible to select. + Sets the area of confusion for picking elements in 3D view. Larger value makes it easier to pick stuff, but will make some small features impossible to select. + + + + Tree View + + + + Object being edited + + + + Active container @@ -2748,10 +2977,6 @@ Specify another directory, please. Sort enabled workbenches - - <b>Sort enabled workbenches</p> - - Move up @@ -2768,6 +2993,10 @@ Specify another directory, please. Add all to enabled workbenches + + <p>Sort enabled workbenches</p> + + Gui::Dialog::DockablePlacement @@ -2842,10 +3071,6 @@ Specify another directory, please. Are you sure you want to delete all transient directories? - - When deleting all transient directory you won't be able to recover any files afterwards. - - Finished @@ -2860,6 +3085,10 @@ Specify another directory, please. The 'Status' column shows whether the document could be recovered. + + When deleting all transient directories you won't be able to recover any files afterwards. + + Gui::Dialog::DownloadItem @@ -3191,14 +3420,6 @@ The 'Status' column shows whether the document could be recovered.Rotation axis with angle - - Apply placement changes immediately - - - - Apply incremental changes to object placement - - Apply @@ -3227,6 +3448,30 @@ The 'Status' column shows whether the document could be recovered.Use center of mass + + Axial: + + + + Apply axial + + + + Shift click for opposite direction + + + + Selected points + + + + Apply incremental changes + + + + Please select 1, 2, or 3 points before clicking this button. A point may be on a vertex, face, or edge. If on a face or edge the point used will be the point at the mouse position along face or edge. If 1 point is selected it will be used as the center of rotation. If 2 points are selected the midpoint between them will be the center of rotation and a new custom axis will be created, if needed. If 3 points are selected the first point becomes the center of rotation and lies on the vector that is normal to the plane defined by the 3 points. Some distance and angle information is provided in the report view, which can be useful when aligning objects. For your convenience when Shift + click is used the appropriate distance or angle is copied to the clipboard. + + Gui::Dialog::PrintModel @@ -3340,10 +3585,6 @@ The 'Status' column shows whether the document could be recovered.CombiView - - Project - - Tasks @@ -3621,19 +3862,19 @@ Do you want to save your changes? Gui::GestureNavigationStyle - Tap. Or click left mouse button. + Tap OR click left mouse button. - Drag screen with two fingers. Or press right mouse button. + Drag screen with two fingers OR press right mouse button. - Drag the screen with one finger. Or press left mouse button. In Sketcher and other edit modes, hold Alt in addition. + Drag screen with one finger OR press left mouse button. In Sketcher and other edit modes, hold Alt in addition. - Pinch (put two fingers on the screen and drag them apart/to each other). Or scroll middle mouse button. Or PgUp/PgDown on keyboard. + Pinch (place two fingers on the screen and drag them apart from or towards each other) OR scroll middle mouse button OR PgUp/PgDown on keyboard. @@ -3915,27 +4156,26 @@ How do you want to proceed? Gui::MayaGestureNavigationStyle - Tap. Or click left mouse button. + Tap OR click left mouse button. - Drag screen with two fingers. Or press ALT + middle mouse button. + Drag screen with two fingers OR press ALT + middle mouse button. - Drag the screen with one finger. Or press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition. + Drag screen with one finger OR press ALT + left mouse button. In Sketcher and other edit modes, hold Alt in addition. - Pinch (put two fingers on the screen and drag them apart/to each other). Or scroll middle mouse button. Or press ALT + right mouse button. Or PgUp/PgDown on keyboard. + Pinch (place two fingers on the screen and drag them apart from or towards each other) OR scroll middle mouse button OR press ALT + right mouse button OR PgUp/PgDown on keyboard. Gui::NetworkRetriever - Download started... - + Download started... @@ -4017,6 +4257,13 @@ How do you want to proceed? + + Gui::PropertyEditor::PropertyEditor + + Edit %1 + + + Gui::PropertyEditor::PropertyModel @@ -4390,6 +4637,13 @@ Do you want to specify another directory? + + Gui::TreePanel + + Search + + + Gui::TreeWidget @@ -4456,6 +4710,14 @@ Do you want to specify another directory? %1, Internal name: %2 + + Search... + + + + Search for objects + + Gui::View3DInventor @@ -5007,23 +5269,35 @@ Be aware the point where you click matters. - %1.%2.%3 + Delete group content? - Translation: + The %1 is not empty, delete its content as well? - Rotation: + Export failed - Delete group content? + Split - The %1 is not empty, delete its content as well? + Translation: + + + + Rotation: + + + + Toggle active part + + + + Edit text @@ -5416,7 +5690,7 @@ Be aware the point where you click matters. - Enters or leaves the selected object's edit mode + Activates or Deactivates the selected object's edit mode @@ -5751,11 +6025,11 @@ Be aware the point where you click matters. - %1 document (*.fcstd) + Cannot merge project with itself. - Cannot merge project with itself. + %1 document (*.FCStd) @@ -6432,47 +6706,47 @@ Be aware the point where you click matters. - StdCmdViewAxo + StdCmdViewBottom Standard-View - Axonometric + Bottom - Set to axonometric view + Set to bottom view - StdCmdViewBottom + StdCmdViewCreate Standard-View - Bottom + Create new view - Set to bottom view + Creates a new view window for the active document - StdCmdViewCreate + StdCmdViewDimetric Standard-View - Create new view + Dimetric - Creates a new view window for the active document + Set to dimetric view @@ -6566,6 +6840,21 @@ Be aware the point where you click matters. + + StdCmdViewIsometric + + Standard-View + + + + Isometric + + + + Set to isometric view + + + StdCmdViewIvIssueCamPos @@ -6746,6 +7035,21 @@ Be aware the point where you click matters. + + StdCmdViewTrimetric + + Standard-View + + + + Trimetric + + + + Set to trimetric view + + + StdCmdViewVR @@ -6862,6 +7166,66 @@ Be aware the point where you click matters. + + StdTreeCollapseDocument + + View + + + + Collapse/Expand + + + + Expand active document and collapse all others + + + + + StdTreeMultiDocument + + View + + + + Multi Document + + + + Display all documents in the tree view + + + + + StdTreeSingleDocument + + View + + + + Single Document + + + + Only display the active document in the tree view + + + + + StdTreeViewDocument + + View + + + + Document Tree + + + + Set visibility of inactive documents in tree view + + + StdViewBoxZoom @@ -6973,15 +7337,19 @@ Be aware the point where you click matters. Std_Delete - Object dependencies + These items are linked to items selected for deletion and might break. - The following, referencing objects might break. - -Are you sure you want to continue? - - + These items are selected for deletion, but are not in the active document. + + + + Are you sure you want to continue? + + + + Delete Selection Issues @@ -7085,6 +7453,50 @@ Do you want to duplicate them, too? + + ViewIsometricCmd + + Isometric + + + + Set NaviCube to Isometric mode + + + + + ViewOrthographicCmd + + Orthographic + + + + Set View to Orthographic mode + + + + + ViewPerspectiveCmd + + Perspective + + + + Set View to Perspective mode + + + + + ViewZoomToFitCmd + + Zoom to fit + + + + Zoom so that model fills the view + + + Workbench diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py index 19d5cbd00b66..b02714da3314 100755 --- a/src/Tools/updatets.py +++ b/src/Tools/updatets.py @@ -178,7 +178,7 @@ def update_translation(path): if "Mod" in path: tsname = " -ts "+os.path.join("Gui","Resources","translations",os.path.basename(path) + ".ts") elif "src/Gui" in path: - tsname = " -ts "+os.path.join("Languages", "FreeCAD.ts") + tsname = " -ts "+os.path.join("Language", "FreeCAD.ts") os.system(LUPDATE + " " + filename + tsname) os.remove(filename) os.chdir(cur)