Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

FreeCAD · Feb 27, 2015 · bebca4e · bebca4e
2 parents b24f25d + 8d8eba6
commit bebca4e
Show file tree

Hide file tree

Showing 947 changed files with 97,354 additions and 41,353 deletions.
diff --git a/src/Gui/Language/FreeCAD_af.qm b/src/Gui/Language/FreeCAD_af.qm
diff --git a/src/Gui/Language/FreeCAD_af.ts b/src/Gui/Language/FreeCAD_af.ts
diff --git a/src/Gui/Language/FreeCAD_cs.qm b/src/Gui/Language/FreeCAD_cs.qm
diff --git a/src/Gui/Language/FreeCAD_cs.ts b/src/Gui/Language/FreeCAD_cs.ts
diff --git a/src/Gui/Language/FreeCAD_de.qm b/src/Gui/Language/FreeCAD_de.qm
diff --git a/src/Gui/Language/FreeCAD_de.ts b/src/Gui/Language/FreeCAD_de.ts
diff --git a/src/Gui/Language/FreeCAD_es-ES.qm b/src/Gui/Language/FreeCAD_es-ES.qm
diff --git a/src/Gui/Language/FreeCAD_es-ES.ts b/src/Gui/Language/FreeCAD_es-ES.ts
diff --git a/src/Gui/Language/FreeCAD_fi.qm b/src/Gui/Language/FreeCAD_fi.qm
diff --git a/src/Gui/Language/FreeCAD_fi.ts b/src/Gui/Language/FreeCAD_fi.ts
diff --git a/src/Gui/Language/FreeCAD_fr.qm b/src/Gui/Language/FreeCAD_fr.qm
diff --git a/src/Gui/Language/FreeCAD_fr.ts b/src/Gui/Language/FreeCAD_fr.ts
diff --git a/src/Gui/Language/FreeCAD_hr.qm b/src/Gui/Language/FreeCAD_hr.qm
diff --git a/src/Gui/Language/FreeCAD_hr.ts b/src/Gui/Language/FreeCAD_hr.ts
diff --git a/src/Gui/Language/FreeCAD_hu.qm b/src/Gui/Language/FreeCAD_hu.qm
diff --git a/src/Gui/Language/FreeCAD_hu.ts b/src/Gui/Language/FreeCAD_hu.ts
diff --git a/src/Gui/Language/FreeCAD_it.qm b/src/Gui/Language/FreeCAD_it.qm
diff --git a/src/Gui/Language/FreeCAD_it.ts b/src/Gui/Language/FreeCAD_it.ts
diff --git a/src/Gui/Language/FreeCAD_ja.qm b/src/Gui/Language/FreeCAD_ja.qm
diff --git a/src/Gui/Language/FreeCAD_ja.ts b/src/Gui/Language/FreeCAD_ja.ts
diff --git a/src/Gui/Language/FreeCAD_nl.qm b/src/Gui/Language/FreeCAD_nl.qm
diff --git a/src/Gui/Language/FreeCAD_nl.ts b/src/Gui/Language/FreeCAD_nl.ts
diff --git a/src/Gui/Language/FreeCAD_no.qm b/src/Gui/Language/FreeCAD_no.qm
diff --git a/src/Gui/Language/FreeCAD_no.ts b/src/Gui/Language/FreeCAD_no.ts
diff --git a/src/Gui/Language/FreeCAD_pl.qm b/src/Gui/Language/FreeCAD_pl.qm
diff --git a/src/Gui/Language/FreeCAD_pl.ts b/src/Gui/Language/FreeCAD_pl.ts
diff --git a/src/Gui/Language/FreeCAD_pt-BR.qm b/src/Gui/Language/FreeCAD_pt-BR.qm
diff --git a/src/Gui/Language/FreeCAD_pt-BR.ts b/src/Gui/Language/FreeCAD_pt-BR.ts
diff --git a/src/Gui/Language/FreeCAD_pt-PT.qm b/src/Gui/Language/FreeCAD_pt-PT.qm
diff --git a/src/Gui/Language/FreeCAD_pt-PT.ts b/src/Gui/Language/FreeCAD_pt-PT.ts
diff --git a/src/Gui/Language/FreeCAD_ro.qm b/src/Gui/Language/FreeCAD_ro.qm
diff --git a/src/Gui/Language/FreeCAD_ro.ts b/src/Gui/Language/FreeCAD_ro.ts
diff --git a/src/Gui/Language/FreeCAD_ru.qm b/src/Gui/Language/FreeCAD_ru.qm
diff --git a/src/Gui/Language/FreeCAD_ru.ts b/src/Gui/Language/FreeCAD_ru.ts
diff --git a/src/Gui/Language/FreeCAD_sr.qm b/src/Gui/Language/FreeCAD_sr.qm
diff --git a/src/Gui/Language/FreeCAD_sr.ts b/src/Gui/Language/FreeCAD_sr.ts
diff --git a/src/Gui/Language/FreeCAD_sv-SE.qm b/src/Gui/Language/FreeCAD_sv-SE.qm
diff --git a/src/Gui/Language/FreeCAD_sv-SE.ts b/src/Gui/Language/FreeCAD_sv-SE.ts
diff --git a/src/Gui/Language/FreeCAD_uk.qm b/src/Gui/Language/FreeCAD_uk.qm
diff --git a/src/Gui/Language/FreeCAD_uk.ts b/src/Gui/Language/FreeCAD_uk.ts
diff --git a/src/Gui/Language/FreeCAD_zh-CN.qm b/src/Gui/Language/FreeCAD_zh-CN.qm
diff --git a/src/Gui/Language/FreeCAD_zh-CN.ts b/src/Gui/Language/FreeCAD_zh-CN.ts
diff --git a/src/Gui/Language/FreeCAD_zh-TW.qm b/src/Gui/Language/FreeCAD_zh-TW.qm
diff --git a/src/Gui/Language/FreeCAD_zh-TW.ts b/src/Gui/Language/FreeCAD_zh-TW.ts
diff --git a/src/Gui/Language/translation.qrc b/src/Gui/Language/translation.qrc
@@ -34,5 +34,6 @@
         <file>FreeCAD_ro.qm</file>
         <file>FreeCAD_hu.qm</file>
         <file>FreeCAD_pt-PT.qm</file>
+        <file>FreeCAD_sr.qm</file>
     </qresource>
 </RCC> 
diff --git a/src/Mod/Arch/Resources/Arch.qrc b/src/Mod/Arch/Resources/Arch.qrc
@@ -83,5 +83,6 @@
         <file>translations/Arch_zh-CN.qm</file>
         <file>translations/Arch_ro.qm</file>
         <file>translations/Arch_pt-PT.qm</file>
+        <file>translations/Arch_sr.qm</file>
     </qresource>
 </RCC> 
diff --git a/src/Mod/Arch/Resources/translations/Arch.ts b/src/Mod/Arch/Resources/translations/Arch.ts
@@ -168,7 +168,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="715"/>
+        <location filename="ArchRoof.py" line="720"/>
         <source>Roof</source>
         <translation type="unfinished"></translation>
     </message>
@@ -368,7 +368,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="importDAE.py" line="180"/>
+        <location filename="importDAE.py" line="182"/>
         <source>file %s successfully created.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -942,7 +942,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="716"/>
+        <location filename="ArchRoof.py" line="721"/>
         <source>Parameters of the profiles of the roof:
 * Angle : slope in degrees compared to the horizontal one.
 * Run : outdistance between the wall and the ridge sheathing.
@@ -957,12 +957,12 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="717"/>
+        <location filename="ArchRoof.py" line="722"/>
         <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="717"/>
+        <location filename="ArchRoof.py" line="722"/>
         <source>IdRel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1148,27 +1148,27 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="717"/>
+        <location filename="ArchRoof.py" line="722"/>
         <source>Angle (deg)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="717"/>
+        <location filename="ArchRoof.py" line="722"/>
         <source>Run (mm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="717"/>
+        <location filename="ArchRoof.py" line="722"/>
         <source>Thickness (mm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="717"/>
+        <location filename="ArchRoof.py" line="722"/>
         <source>Overhang (mm)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="ArchRoof.py" line="717"/>
+        <location filename="ArchRoof.py" line="722"/>
         <source>Height (mm)</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/Mod/Arch/Resources/translations/Arch_af.qm b/src/Mod/Arch/Resources/translations/Arch_af.qm