Skip to content

Commit

Permalink
Merge branch 'master' into feature/jobsetupplane
Browse files Browse the repository at this point in the history
  • Loading branch information
dubstar-04 committed Oct 28, 2020
2 parents e64cb66 + f7532b9 commit 4852ac7
Show file tree
Hide file tree
Showing 859 changed files with 83,771 additions and 61,400 deletions.
26 changes: 17 additions & 9 deletions src/Gui/Language/FreeCAD.ts
Expand Up @@ -120,6 +120,13 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Command</name>
<message>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>DlgCustomizeSpNavSettings</name>
<message>
Expand Down Expand Up @@ -2486,6 +2493,16 @@ opening or creation</source>
<source>Show axis cross by default</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
Expand Down Expand Up @@ -3524,10 +3541,6 @@ Mouse tilting is not disabled by this setting.</source>
<source>Simple color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Object being edited</source>
<translation type="unfinished"></translation>
Expand All @@ -3544,11 +3557,6 @@ Mouse tilting is not disabled by this setting.</source>
<source>Enable selection highlighting and use specified color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Background color for the model view</source>
<translation type="unfinished"></translation>
Expand Down
Binary file modified src/Gui/Language/FreeCAD_af.qm
Binary file not shown.
29 changes: 19 additions & 10 deletions src/Gui/Language/FreeCAD_af.ts
Expand Up @@ -120,6 +120,13 @@
<translation type="unfinished">Toggle measurement</translation>
</message>
</context>
<context>
<name>Command</name>
<message>
<source>Edit</source>
<translation>Wysig</translation>
</message>
</context>
<context>
<name>DlgCustomizeSpNavSettings</name>
<message>
Expand Down Expand Up @@ -2535,6 +2542,18 @@ opening or creation</translation>
<source>Show axis cross by default</source>
<translation type="unfinished">Show axis cross by default</translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation type="unfinished">Pick radius (px):</translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</source>
<translation type="unfinished">Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
Expand Down Expand Up @@ -3591,10 +3610,6 @@ Mouse tilting is not disabled by this setting.</translation>
<source>Simple color</source>
<translation>Eenvoudige kleur</translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation type="unfinished">Pick radius (px):</translation>
</message>
<message>
<source>Object being edited</source>
<translation type="unfinished">Object being edited</translation>
Expand All @@ -3611,12 +3626,6 @@ Mouse tilting is not disabled by this setting.</translation>
<source>Enable selection highlighting and use specified color</source>
<translation type="unfinished">Enable selection highlighting and use specified color</translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.</source>
<translation type="unfinished">Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.</translation>
</message>
<message>
<source>Background color for the model view</source>
<translation type="unfinished">Background color for the model view</translation>
Expand Down
Binary file modified src/Gui/Language/FreeCAD_ar.qm
Binary file not shown.
29 changes: 19 additions & 10 deletions src/Gui/Language/FreeCAD_ar.ts
Expand Up @@ -120,6 +120,13 @@
<translation>تبديل القياسات</translation>
</message>
</context>
<context>
<name>Command</name>
<message>
<source>Edit</source>
<translation>تعديل</translation>
</message>
</context>
<context>
<name>DlgCustomizeSpNavSettings</name>
<message>
Expand Down Expand Up @@ -2536,6 +2543,18 @@ opening or creation</translation>
<source>Show axis cross by default</source>
<translation type="unfinished">Show axis cross by default</translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation type="unfinished">Pick radius (px):</translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</source>
<translation type="unfinished">Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
Expand Down Expand Up @@ -3592,10 +3611,6 @@ Mouse tilting is not disabled by this setting.</translation>
<source>Simple color</source>
<translation type="unfinished">Simple color</translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation type="unfinished">Pick radius (px):</translation>
</message>
<message>
<source>Object being edited</source>
<translation type="unfinished">Object being edited</translation>
Expand All @@ -3612,12 +3627,6 @@ Mouse tilting is not disabled by this setting.</translation>
<source>Enable selection highlighting and use specified color</source>
<translation type="unfinished">Enable selection highlighting and use specified color</translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.</source>
<translation type="unfinished">Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.</translation>
</message>
<message>
<source>Background color for the model view</source>
<translation type="unfinished">Background color for the model view</translation>
Expand Down
Binary file modified src/Gui/Language/FreeCAD_ca.qm
Binary file not shown.
29 changes: 19 additions & 10 deletions src/Gui/Language/FreeCAD_ca.ts
Expand Up @@ -120,6 +120,13 @@
<translation>Commuta el mesurament</translation>
</message>
</context>
<context>
<name>Command</name>
<message>
<source>Edit</source>
<translation>Edita</translation>
</message>
</context>
<context>
<name>DlgCustomizeSpNavSettings</name>
<message>
Expand Down Expand Up @@ -2525,6 +2532,18 @@ opening or creation</translation>
<source>Show axis cross by default</source>
<translation type="unfinished">Show axis cross by default</translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation>Trieu el radi (px):</translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</source>
<translation type="unfinished">Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
Expand Down Expand Up @@ -3576,10 +3595,6 @@ Mouse tilting is not disabled by this setting.</source>
<source>Simple color</source>
<translation>Color simple</translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation>Trieu el radi (px):</translation>
</message>
<message>
<source>Object being edited</source>
<translation>L'objecte s'està editant</translation>
Expand All @@ -3596,12 +3611,6 @@ Mouse tilting is not disabled by this setting.</source>
<source>Enable selection highlighting and use specified color</source>
<translation>Activa el ressaltat de la selecció i utilitza el color especificat</translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.</source>
<translation>Àrea per a seleccionar elements en vista 3D.
Un valor més gran en facilita la selecció, però pot fer que les propietats xicotetes no es puguin seleccionar.</translation>
</message>
<message>
<source>Background color for the model view</source>
<translation>Color del fons per a la vista del model</translation>
Expand Down
Binary file modified src/Gui/Language/FreeCAD_cs.qm
Binary file not shown.
29 changes: 19 additions & 10 deletions src/Gui/Language/FreeCAD_cs.ts
Expand Up @@ -120,6 +120,13 @@
<translation>Přepni měření</translation>
</message>
</context>
<context>
<name>Command</name>
<message>
<source>Edit</source>
<translation>Upravit</translation>
</message>
</context>
<context>
<name>DlgCustomizeSpNavSettings</name>
<message>
Expand Down Expand Up @@ -2531,6 +2538,18 @@ opening or creation</translation>
<source>Show axis cross by default</source>
<translation type="unfinished">Show axis cross by default</translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation>Vyberte poloměr (px):</translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</source>
<translation type="unfinished">Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.
</translation>
</message>
</context>
<context>
<name>Gui::Dialog::DlgSettings3DViewImp</name>
Expand Down Expand Up @@ -3586,10 +3605,6 @@ Mouse tilting is not disabled by this setting.</translation>
<source>Simple color</source>
<translation>Jednoduchá barva</translation>
</message>
<message>
<source>Pick radius (px):</source>
<translation>Vyberte poloměr (px):</translation>
</message>
<message>
<source>Object being edited</source>
<translation>Upravovaný objekt</translation>
Expand All @@ -3606,12 +3621,6 @@ Mouse tilting is not disabled by this setting.</translation>
<source>Enable selection highlighting and use specified color</source>
<translation type="unfinished">Enable selection highlighting and use specified color</translation>
</message>
<message>
<source>Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.</source>
<translation type="unfinished">Area for picking elements in 3D view.
Larger value eases to pick things, but can make small features impossible to select.</translation>
</message>
<message>
<source>Background color for the model view</source>
<translation type="unfinished">Background color for the model view</translation>
Expand Down
Binary file modified src/Gui/Language/FreeCAD_de.qm
Binary file not shown.

0 comments on commit 4852ac7

Please sign in to comment.