Pārlūkot izejas kodu

- finished the update on French Google translation.

Marius Stanciu 6 gadi atpakaļ
vecāks
revīzija
46659af432
5 mainītis faili ar 334 papildinājumiem un 319 dzēšanām
  1. 6 0
      FlatCAMApp.py
  2. 2 1
      README.md
  3. 2 2
      camlib.py
  4. BIN
      locale/fr/LC_MESSAGES/strings.mo
  5. 324 316
      locale/fr/LC_MESSAGES/strings.po

+ 6 - 0
FlatCAMApp.py

@@ -3233,6 +3233,9 @@ class App(QtCore.QObject):
         """
         self.report_usage("object2editor()")
 
+        # disable the objects menu as it may interfere with the Editors
+        self.ui.menuobjects.setDisabled(True)
+
         edited_object = self.collection.get_active()
 
         if isinstance(edited_object, FlatCAMGerber) or isinstance(edited_object, FlatCAMGeometry) or \
@@ -3321,6 +3324,9 @@ class App(QtCore.QObject):
         """
         self.report_usage("editor2object()")
 
+        # re-enable the objects menu that was disabled on entry in Editor mode
+        self.ui.menuobjects.setDisabled(False)
+
         # do not update a geometry or excellon object unless it comes out of an editor
         if self.call_source != 'app':
             edited_obj = self.collection.get_active()

+ 2 - 1
README.md

@@ -13,12 +13,13 @@ CAD program, and create G-Code for Isolation routing.
 
 - fixed a bug in milling holes due of a message wrongly formatted
 - added an translator email address
-- finished the update on German translation. Part of it was corrected by Jens Karstedt
+- finished the update on German Google translation. Part of it was corrected by Jens Karstedt
 - finished the update of the Romanian translation.
 - finished the Objects menu by adding the ability of actions to be checked so they will show the selected status of the objects and by adding to actions to (de)select all objects
 - fixed and optimized the click selection on canvas
 - fixed Gerber parsing for very simple Gerber files that have only one Polygon but many LPC zones
 - fixed SVG export
+- finished the update on French Google translation.
 
 16.10.2019
 

+ 2 - 2
camlib.py

@@ -158,9 +158,9 @@ class ApertureMacro:
 
             # ## Variables
             # These are variables defined locally inside the macro. They can be
-            # numerical constant or defind in terms of previously define
+            # numerical constant or defined in terms of previously define
             # variables, which can be defined locally or in an aperture
-            # definition. All replacements ocurr here.
+            # definition. All replacements occur here.
             match = ApertureMacro.amvar_re.search(part)
             if match:
                 var = match.group(1)

BIN
locale/fr/LC_MESSAGES/strings.mo


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 324 - 316
locale/fr/LC_MESSAGES/strings.po


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels