Merge branch 'master' into RRF-PP-for-Path

src/App/Application.cpp

@@ -1061,7 +1061,12 @@ std::string Application::getTempFileName(const char* FileName)
     return Base::FileInfo::getTempFileName(FileName, getTempPath().c_str());
 }
 
-std::string Application::getUserConfigDir()
+std::string Application::getUserCachePath()
+{
+    return mConfig["UserCachePath"];
+}
+
+std::string Application::getUserConfigPath()
 {
     return mConfig["UserConfigPath"];
 }
@@ -2958,11 +2963,6 @@ boost::filesystem::path findPath(const QString& stdHome, const QString& customHo
 
     boost::filesystem::path appData(stringToPath(dataPath.toStdString()));
 
-    //if (!boost::filesystem::exists(appData)) {
-    //    // This should never ever happen
-    //    throw Base::FileSystemError("Application data directory " + appData.string() + " does not exist!");
-    //}
-
     // If a custom user home path is given then don't modify it
     if (customHome.isEmpty()) {
         for (const auto& it : paths)
@@ -3039,20 +3039,20 @@ std::tuple<QString, QString, QString> getCustomPaths()
  * \li XDG_CACHE_HOME
  * \endlist
  */
-std::tuple<QString, QString, QString> getStandardPaths()
+std::tuple<QString, QString, QString, QString> getStandardPaths()
 {
     QString configHome = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
     QString dataHome = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
     QString cacheHome = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
+    QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
 
     // Keep the old behaviour
 #if defined(FC_OS_WIN32)
     configHome = getOldGenericDataLocation(QString());
     dataHome = configHome;
-    cacheHome = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
 #endif
 
-    return std::make_tuple(configHome, dataHome, cacheHome);
+    return std::make_tuple(configHome, dataHome, cacheHome, tempPath);
 }
 }
 
@@ -3075,6 +3075,7 @@ void Application::ExtractUserPath()
     QString configHome = std::get<0>(stdPaths);
     QString dataHome = std::get<1>(stdPaths);
     QString cacheHome = std::get<2>(stdPaths);
+    QString tempPath = std::get<3>(stdPaths);
 
     // User home path
     //
@@ -3116,12 +3117,19 @@ void Application::ExtractUserPath()
     }
 
 
-    // Set application tmp. directory
+    // User cache path
     //
     std::vector<std::string> cachedirs = subdirs;
     cachedirs.emplace_back("Cache");
     boost::filesystem::path cache = findPath(cacheHome, customTemp, cachedirs, true);
-    mConfig["AppTempPath"] = pathToString(cache) + PATHSEP;
+    mConfig["UserCachePath"] = pathToString(cache) + PATHSEP;
+
+
+    // Set application tmp. directory
+    //
+    std::vector<std::string> empty;
+    boost::filesystem::path tmp = findPath(tempPath, customTemp, empty, true);
+    mConfig["AppTempPath"] = pathToString(tmp) + PATHSEP;
 
 
     // Set the default macro directory

src/App/Application.h

@@ -403,7 +403,8 @@ public:
      */
     static std::string getTempPath();
     static std::string getTempFileName(const char* FileName=0);
-    static std::string getUserConfigDir();
+    static std::string getUserCachePath();
+    static std::string getUserConfigPath();
     static std::string getUserAppDataDir();
     static std::string getUserMacroDir();
     static std::string getResourceDir();
@@ -513,11 +514,13 @@ private:
     static PyObject* sAddExportType     (PyObject *self,PyObject *args);
     static PyObject* sChangeExportModule(PyObject *self,PyObject *args);
     static PyObject* sGetExportType     (PyObject *self,PyObject *args);
-    static PyObject* sGetResourceDir    (PyObject *self,PyObject *args);
-    static PyObject* sGetUserConfigDir  (PyObject *self,PyObject *args);
-    static PyObject* sGetUserAppDataDir (PyObject *self,PyObject *args);
-    static PyObject* sGetUserMacroDir   (PyObject *self,PyObject *args);
-    static PyObject* sGetHelpDir        (PyObject *self,PyObject *args);
+    static PyObject* sGetResourcePath   (PyObject *self,PyObject *args);
+    static PyObject* sGetTempPath       (PyObject *self,PyObject *args);
+    static PyObject* sGetUserCachePath  (PyObject *self,PyObject *args);
+    static PyObject* sGetUserConfigPath (PyObject *self,PyObject *args);
+    static PyObject* sGetUserAppDataPath(PyObject *self,PyObject *args);
+    static PyObject* sGetUserMacroPath  (PyObject *self,PyObject *args);
+    static PyObject* sGetHelpPath       (PyObject *self,PyObject *args);
     static PyObject* sGetHomePath       (PyObject *self,PyObject *args);
 
     static PyObject* sLoadFile          (PyObject *self,PyObject *args);

src/App/ApplicationPy.cpp

@@ -86,18 +86,22 @@ PyMethodDef Application::Methods[] = {
      "Change the export module name of a registered filetype"},
     {"getExportType",  (PyCFunction) Application::sGetExportType, METH_VARARGS,
      "Get the name of the module that can export the filetype"},
-    {"getResourceDir", (PyCFunction) Application::sGetResourceDir, METH_VARARGS,
+    {"getResourceDir", (PyCFunction) Application::sGetResourcePath, METH_VARARGS,
      "Get the root directory of all resources"},
-    {"getUserConfigDir", (PyCFunction) Application::sGetUserConfigDir, METH_VARARGS,
-     "Get the root directory of user config files"},
-    {"getUserAppDataDir", (PyCFunction) Application::sGetUserAppDataDir, METH_VARARGS,
+    {"getTempPath", (PyCFunction) Application::sGetTempPath, METH_VARARGS,
+     "Get the root directory of cached files"},
+    {"getUserCachePath", (PyCFunction) Application::sGetUserCachePath, METH_VARARGS,
+     "Get the root path of cached files"},
+    {"getUserConfigDir", (PyCFunction) Application::sGetUserConfigPath, METH_VARARGS,
+     "Get the root path of user config files"},
+    {"getUserAppDataDir", (PyCFunction) Application::sGetUserAppDataPath, METH_VARARGS,
      "Get the root directory of application data"},
-    {"getUserMacroDir", (PyCFunction) Application::sGetUserMacroDir, METH_VARARGS,
+    {"getUserMacroDir", (PyCFunction) Application::sGetUserMacroPath, METH_VARARGS,
      "getUserMacroDir(bool=False) -> string"
      "Get the directory of the user's macro directory\n"
      "If parameter is False (the default) it returns the standard path in the"
      "user's home directory, otherwise it returns the user-defined path."},
-    {"getHelpDir", (PyCFunction) Application::sGetHelpDir, METH_VARARGS,
+    {"getHelpDir", (PyCFunction) Application::sGetHelpPath, METH_VARARGS,
      "Get the directory of the documentation"},
     {"getHomePath",    (PyCFunction) Application::sGetHomePath, METH_VARARGS,
      "Get the home path, i.e. the parent directory of the executable"},
@@ -644,38 +648,56 @@ PyObject* Application::sGetExportType(PyObject * /*self*/, PyObject *args)
     }
 }
 
-PyObject* Application::sGetResourceDir(PyObject * /*self*/, PyObject *args)
+PyObject* Application::sGetResourcePath(PyObject * /*self*/, PyObject *args)
 {
-    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
-        return NULL;                       // NULL triggers exception
+    if (!PyArg_ParseTuple(args, ""))
+        return nullptr;
 
     Py::String datadir(Application::getResourceDir(),"utf-8");
     return Py::new_reference_to(datadir);
 }
 
-PyObject* Application::sGetUserConfigDir(PyObject * /*self*/, PyObject *args)
+PyObject* Application::sGetTempPath(PyObject * /*self*/, PyObject *args)
 {
     if (!PyArg_ParseTuple(args, ""))
         return nullptr;
 
-    Py::String datadir(Application::getUserConfigDir(),"utf-8");
+    Py::String datadir(Application::getTempPath(),"utf-8");
     return Py::new_reference_to(datadir);
 }
 
-PyObject* Application::sGetUserAppDataDir(PyObject * /*self*/, PyObject *args)
+PyObject* Application::sGetUserCachePath(PyObject * /*self*/, PyObject *args)
 {
-    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
-        return NULL;                       // NULL triggers exception
+    if (!PyArg_ParseTuple(args, ""))
+        return nullptr;
+
+    Py::String datadir(Application::getUserCachePath(),"utf-8");
+    return Py::new_reference_to(datadir);
+}
+
+PyObject* Application::sGetUserConfigPath(PyObject * /*self*/, PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, ""))
+        return nullptr;
+
+    Py::String datadir(Application::getUserConfigPath(),"utf-8");
+    return Py::new_reference_to(datadir);
+}
+
+PyObject* Application::sGetUserAppDataPath(PyObject * /*self*/, PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, ""))
+        return nullptr;
 
     Py::String user_data_dir(Application::getUserAppDataDir(),"utf-8");
     return Py::new_reference_to(user_data_dir);
 }
 
-PyObject* Application::sGetUserMacroDir(PyObject * /*self*/, PyObject *args)
+PyObject* Application::sGetUserMacroPath(PyObject * /*self*/, PyObject *args)
 {
     PyObject *actual = Py_False;
     if (!PyArg_ParseTuple(args, "|O!", &PyBool_Type, &actual))
-        return NULL;
+        return nullptr;
 
     std::string macroDir = Application::getUserMacroDir();
     if (PyObject_IsTrue(actual)) {
@@ -688,10 +710,10 @@ PyObject* Application::sGetUserMacroDir(PyObject * /*self*/, PyObject *args)
     return Py::new_reference_to(user_macro_dir);
 }
 
-PyObject* Application::sGetHelpDir(PyObject * /*self*/, PyObject *args)
+PyObject* Application::sGetHelpPath(PyObject * /*self*/, PyObject *args)
 {
-    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
-        return NULL;                       // NULL triggers exception
+    if (!PyArg_ParseTuple(args, ""))
+        return nullptr;
 
     Py::String user_macro_dir(Application::getHelpDir(),"utf-8");
     return Py::new_reference_to(user_macro_dir);
@@ -699,8 +721,8 @@ PyObject* Application::sGetHelpDir(PyObject * /*self*/, PyObject *args)
 
 PyObject* Application::sGetHomePath(PyObject * /*self*/, PyObject *args)
 {
-    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
-        return NULL;                       // NULL triggers exception
+    if (!PyArg_ParseTuple(args, ""))
+        return nullptr;
 
     Py::String homedir(Application::getHomePath(),"utf-8");
     return Py::new_reference_to(homedir);

src/App/Document.cpp

@@ -1684,7 +1684,7 @@ std::string Document::getTransientDirectoryName(const std::string& uuid, const s
     std::stringstream s;
     QCryptographicHash hash(QCryptographicHash::Sha1);
     hash.addData(filename.c_str(), filename.size());
-    s << App::Application::getTempPath() << App::Application::getExecutableName()
+    s << App::Application::getUserCachePath() << App::Application::getExecutableName()
       << "_Doc_" << uuid
       << "_" << hash.result().toHex().left(6).constData()
       << "_" << QCoreApplication::applicationPid();

src/App/Metadata.h

@@ -30,6 +30,7 @@
 #include <string>
 #include <vector>
 #include <map>
+#include <memory>
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>

src/App/PropertyLinks.cpp

@@ -1599,6 +1599,16 @@ PropertyLinkSubList::~PropertyLinkSubList()
 #endif
 }
 
+void PropertyLinkSubList::verifyObject(App::DocumentObject* obj, App::DocumentObject* parent)
+{
+    if (obj) {
+        if (!obj->getNameInDocument())
+            throw Base::ValueError("PropertyLinkSubList: invalid document object");
+        if (!testFlag(LinkAllowExternal) && parent && parent->getDocument() != obj->getDocument())
+            throw Base::ValueError("PropertyLinkSubList does not support external object");
+    }
+}
+
 void PropertyLinkSubList::setSize(int newSize)
 {
     _lValueList.resize(newSize);
@@ -1614,12 +1624,8 @@ int PropertyLinkSubList::getSize(void) const
 void PropertyLinkSubList::setValue(DocumentObject* lValue,const char* SubName)
 {
     auto parent = Base::freecad_dynamic_cast<App::DocumentObject>(getContainer());
-    if(lValue) {
-        if(!lValue->getNameInDocument())
-            throw Base::ValueError("PropertyLinkSubList: invalid document object");
-        if(!testFlag(LinkAllowExternal) && parent && parent->getDocument()!=lValue->getDocument())
-            throw Base::ValueError("PropertyLinkSubList does not support external object");
-    }
+    verifyObject(lValue, parent);
+
 #ifndef USE_OLD_DAG
     //maintain backlinks
     if(parent) {
@@ -1657,11 +1663,9 @@ void PropertyLinkSubList::setValues(const std::vector<DocumentObject*>& lValue,c
 {
     auto parent = Base::freecad_dynamic_cast<App::DocumentObject>(getContainer());
     for(auto obj : lValue) {
-        if(!obj || !obj->getNameInDocument())
-            throw Base::ValueError("PropertyLinkSubList: invalid document object");
-        if(!testFlag(LinkAllowExternal) && parent && parent->getDocument()!=obj->getDocument())
-            throw Base::ValueError("PropertyLinkSubList does not support external object");
+        verifyObject(obj, parent);
     }
+
     if (lValue.size() != lSubNames.size())
         throw Base::ValueError("PropertyLinkSubList::setValues: size of subelements list != size of objects list");
 
@@ -1713,10 +1717,7 @@ void PropertyLinkSubList::setValues(std::vector<DocumentObject*>&& lValue,
 {
     auto parent = Base::freecad_dynamic_cast<App::DocumentObject>(getContainer());
     for(auto obj : lValue) {
-        if(!obj || !obj->getNameInDocument())
-            throw Base::ValueError("PropertyLinkSubList: invalid document object");
-        if(!testFlag(LinkAllowExternal) && parent && parent->getDocument()!=obj->getDocument())
-            throw Base::ValueError("PropertyLinkSubList does not support external object");
+        verifyObject(obj, parent);
     }
     if (lValue.size() != lSubNames.size())
         throw Base::ValueError("PropertyLinkSubList::setValues: size of subelements list != size of objects list");
@@ -1758,12 +1759,8 @@ void PropertyLinkSubList::setValues(std::vector<DocumentObject*>&& lValue,
 void PropertyLinkSubList::setValue(DocumentObject* lValue, const std::vector<string> &SubList)
 {
     auto parent = dynamic_cast<App::DocumentObject*>(getContainer());
-    if(lValue) {
-        if(!lValue->getNameInDocument())
-            throw Base::ValueError("PropertyLinkSubList: invalid document object");
-        if(!testFlag(LinkAllowExternal) && parent && parent->getDocument()!=lValue->getDocument())
-            throw Base::ValueError("PropertyLinkSubList does not support external object");
-    }
+    verifyObject(lValue, parent);
+
 #ifndef USE_OLD_DAG
     //maintain backlinks.
     if(parent) {
@@ -1804,6 +1801,70 @@ void PropertyLinkSubList::setValue(DocumentObject* lValue, const std::vector<str
     hasSetValue();
 }
 
+void PropertyLinkSubList::addValue(App::DocumentObject *obj, const std::vector<std::string> &subs, bool reset)
+{
+    auto parent = Base::freecad_dynamic_cast<App::DocumentObject>(getContainer());
+    verifyObject(obj, parent);
+
+#ifndef USE_OLD_DAG
+    //maintain backlinks.
+    if (parent) {
+        // before accessing internals make sure the object is not about to be destroyed
+        // otherwise the backlink contains dangling pointers
+        if (!parent->testStatus(ObjectStatus::Destroy) && _pcScope != LinkScope::Hidden) {
+            //_lValueList can contain items multiple times, but we trust the document
+            //object to ensure that this works
+            if (reset) {
+                for(auto* value : _lValueList) {
+                    if (value && value == obj)
+                        value->_removeBackLink(parent);
+                }
+            }
+
+            //maintain backlinks. lValue can contain items multiple times, but we trust the document
+            //object to ensure that the backlink is only added once
+            if (obj)
+                obj->_addBackLink(parent);
+        }
+    }
+#endif
+
+    std::vector<DocumentObject*> valueList;
+    std::vector<std::string>     subList;
+
+    if (reset) {
+        for (std::size_t i=0; i<_lValueList.size(); i++) {
+            if (_lValueList[i] != obj) {
+                valueList.push_back(_lValueList[i]);
+                subList.push_back(_lSubList[i]);
+            }
+        }
+    }
+    else {
+        valueList = _lValueList;
+        subList = _lSubList;
+    }
+
+    std::size_t size = subs.size();
+    if (size == 0) {
+        if (obj) {
+            valueList.push_back(obj);
+            subList.emplace_back();
+        }
+    }
+    else if (obj) {
+        subList.insert(subList.end(), subs.begin(), subs.end());
+        valueList.insert(valueList.end(), size, obj);
+    }
+
+    aboutToSetValue();
+    _lValueList = valueList;
+    _lSubList = subList;
+    updateElementReference(nullptr);
+    checkLabelReferences(_lSubList);
+    hasSetValue();
+}
+
 const string PropertyLinkSubList::getPyReprString() const
 {
     assert(this->_lValueList.size() == this->_lSubList.size());

src/App/PropertyLinks.h

@@ -935,6 +935,8 @@ public:
      */
     void setValue(App::DocumentObject *lValue, const std::vector<std::string> &SubList=std::vector<std::string>());
 
+    void addValue(App::DocumentObject *obj, const std::vector<std::string> &SubList={}, bool reset = false);
+
     const std::vector<DocumentObject*> &getValues(void) const {
         return _lValueList;
     }
@@ -1004,6 +1006,9 @@ public:
 
     virtual bool adjustLink(const std::set<App::DocumentObject *> &inList) override;
 
+private:
+    void verifyObject(App::DocumentObject *, App::DocumentObject *);
+
 private:
     //FIXME: Do not make two independent lists because this will lead to some inconsistencies!
     std::vector<DocumentObject*> _lValueList;

src/Gui/Application.cpp

@@ -93,6 +93,7 @@
 #include "SpaceballEvent.h"
 #include "Control.h"
 #include "DocumentRecovery.h"
+#include "DlgSettingsCacheDirectory.h"
 #include "TransactionObject.h"
 #include "FileDialog.h"
 #include "ExpressionBindingPy.h"
@@ -2267,7 +2268,7 @@ void Application::runApplication(void)
 
     try {
         std::stringstream s;
-        s << App::Application::getTempPath() << App::Application::getExecutableName()
+        s << App::Application::getUserCachePath() << App::Application::getExecutableName()
           << "_" << QCoreApplication::applicationPid() << ".lock";
         // open a lock file with the PID
         Base::FileInfo fi(s.str());
@@ -2418,7 +2419,16 @@ void Application::setStyleSheet(const QString& qssFile, bool tiledBackground)
 void Application::checkForPreviousCrashes()
 {
     Gui::Dialog::DocumentRecoveryFinder finder;
-    finder.checkForPreviousCrashes();
+    if (!finder.checkForPreviousCrashes()) {
+
+        // If the recovery dialog wasn't shown check the cache size periodically
+        Gui::Dialog::ApplicationCache cache;
+        cache.applyUserSettings();
+        if (cache.periodicCheckOfSize()) {
+            qint64 total = cache.size();
+            cache.performAction(total);
+        }
+    }
 }
 
 App::Document *Application::reopen(App::Document *doc) {

src/Gui/CMakeLists.txt

@@ -328,6 +328,7 @@ SET(Gui_UIC_SRCS
     DlgPropertyLink.ui
     DlgReportView.ui
     DlgSettings3DView.ui
+    DlgSettingsCacheDirectory.ui
     DlgSettingsNavigation.ui
     DlgSettingsSelection.ui
     DlgSettingsUnits.ui
@@ -563,6 +564,7 @@ SET(Dialog_Settings_CPP_SRCS
     DlgPreferencesImp.cpp
     DlgReportViewImp.cpp
     DlgSettings3DViewImp.cpp
+    DlgSettingsCacheDirectory.cpp
     DlgSettingsNavigation.cpp
     DlgSettingsSelection.cpp
     DlgSettingsUnitsImp.cpp
@@ -580,6 +582,7 @@ SET(Dialog_Settings_HPP_SRCS
     DlgPreferencesImp.h
     DlgReportViewImp.h
     DlgSettings3DViewImp.h
+    DlgSettingsCacheDirectory.h
     DlgSettingsNavigation.h
     DlgSettingsSelection.h
     DlgSettingsUnitsImp.h
@@ -599,6 +602,7 @@ SET(Dialog_Settings_SRCS
     DlgPreferences.ui
     DlgReportView.ui
     DlgSettings3DView.ui
+    DlgSettingsCacheDirectory.ui
     DlgSettingsNavigation.ui
     DlgSettingsSelection.ui
     DlgSettingsUnits.ui

src/Gui/DlgEditFileIncludePropertyExternal.cpp

@@ -65,7 +65,7 @@ int DlgEditFileIncludePropertyExternal::Do(void)
     QFileInfo file = QString::fromUtf8(Prop.getValue());
     assert(file.exists());
 
-    QDir tmp = QString::fromUtf8(App::Application::getTempPath().c_str());
+    QDir tmp = QString::fromUtf8(App::Application::getUserCachePath().c_str());
     QString TempFile = tmp.absoluteFilePath(file.fileName());
     QFile::remove(TempFile);
 

src/Gui/DlgSettingsCacheDirectory.cpp

@@ -0,0 +1,391 @@
+/***************************************************************************
+ *   Copyright (c) 2021 Werner Mayer <wmayer[at]users.sourceforge.net>     *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#include "PreCompiled.h"
+
+#ifndef _PreComp_
+# include <QCoreApplication>
+# include <QDate>
+# include <QDesktopServices>
+# include <QDir>
+# include <QLocale>
+# include <QMessageBox>
+# include <QSettings>
+# include <QUrl>
+# include <climits>
+# include <cmath>
+#endif
+
+#include "DlgSettingsCacheDirectory.h"
+#include "ui_DlgSettingsCacheDirectory.h"
+#include "DocumentRecovery.h"
+#include "MainWindow.h"
+#include <App/Application.h>
+#include <App/Document.h>
+
+using namespace Gui::Dialog;
+
+/* TRANSLATOR Gui::Dialog::DlgSettingsCacheDirectory */
+
+QString DlgSettingsCacheDirectory::currentSize;
+
+DlgSettingsCacheDirectory::DlgSettingsCacheDirectory(QWidget* parent)
+  : PreferencePage(parent)
+  , ui(new Ui_DlgSettingsCacheDirectory)
+{
+    ui->setupUi(this);
+    ui->labelCache->setToolTip(tr("Notify the user if the cache size exceeds the specified limit"));
+    if (currentSize.isEmpty())
+        currentSize = tr("Unknown");
+    setCurrentCacheSize(currentSize);
+
+    QString path = QString::fromStdString(App::Application::getUserCachePath());
+    ui->cacheLocation->setText(path);
+
+    ui->comboBoxLimit->addItem(QString::fromLatin1("100 MB"), 100);
+    ui->comboBoxLimit->addItem(QString::fromLatin1("300 MB"), 300);
+    ui->comboBoxLimit->addItem(QString::fromLatin1("500 MB"), 500);
+    ui->comboBoxLimit->addItem(QString::fromLatin1("1 GB"), 1024);
+    ui->comboBoxLimit->addItem(QString::fromLatin1("2 GB"), 2048);
+    ui->comboBoxLimit->addItem(QString::fromLatin1("3 GB"), 3072);
+
+    connect(ui->pushButtonCheck, &QPushButton::clicked, this, &DlgSettingsCacheDirectory::runCheck);
+    connect(ui->openButton, &QPushButton::clicked, this, &DlgSettingsCacheDirectory::openDirectory);
+}
+
+DlgSettingsCacheDirectory::~DlgSettingsCacheDirectory()
+{
+}
+
+void DlgSettingsCacheDirectory::saveSettings()
+{
+    ApplicationCacheSettings::setCheckPeriod(ui->comboBoxPeriod->currentIndex());
+    ApplicationCacheSettings::setCacheSizeLimit(ui->comboBoxLimit->currentData().toUInt());
+}
+
+void DlgSettingsCacheDirectory::loadSettings()
+{
+    int period = ApplicationCacheSettings::getCheckPeriod();
+    if (period >= 0 && period < ui->comboBoxPeriod->count())
+        ui->comboBoxPeriod->setCurrentIndex(period);
+    unsigned int limit = ApplicationCacheSettings::getCacheSizeLimit();
+    int index = ui->comboBoxLimit->findData(limit);
+
+    // if not found then add a new item with this value
+    if (index < 0) {
+        ui->comboBoxLimit->addItem(QString::fromLatin1("%1 MB").arg(limit), limit);
+        index = ui->comboBoxLimit->count() - 1;
+    }
+    ui->comboBoxLimit->setCurrentIndex(index);
+}
+
+void DlgSettingsCacheDirectory::changeEvent(QEvent *e)
+{
+    if (e->type() == QEvent::LanguageChange) {
+        int period = ui->comboBoxPeriod->currentIndex();
+        ui->retranslateUi(this);
+        ui->comboBoxPeriod->setCurrentIndex(period);
+        setCurrentCacheSize(currentSize);
+    }
+    QWidget::changeEvent(e);
+}
+
+void DlgSettingsCacheDirectory::setCurrentCacheSize(const QString& str)
+{
+    currentSize = str;
+    ui->labelCurrentCache->setText(tr("Current cache size: %1").arg(str));
+}
+
+void DlgSettingsCacheDirectory::runCheck()
+{
+    Gui::Dialog::ApplicationCache cache;
+    unsigned int sizeInMB = ui->comboBoxLimit->currentData().toUInt();
+    cache.setLimit(ApplicationCache::toBytes(sizeInMB));
+    qint64 total = cache.size();
+    setCurrentCacheSize(ApplicationCache::toString(total));
+
+    // When performing the clean-up then recompute the new cache size
+    if (cache.performAction(total)) {
+        total = cache.size();
+        setCurrentCacheSize(ApplicationCache::toString(total));
+    }
+}
+
+void DlgSettingsCacheDirectory::openDirectory()
+{
+    QString path = QString::fromStdString(App::Application::getUserCachePath());
+    QUrl url = QUrl::fromLocalFile(path);
+    QDesktopServices::openUrl(url);
+}
+
+// ----------------------------------------------------------------------------
+
+ApplicationCache::ApplicationCache()
+{
+    limit = std::pow(1024, 3);
+    setPeriod(Period::Weekly);
+}
+
+/*!
+ * \brief ApplicationCache::setPeriod
+ * Set the period to check for the cache size
+ * \param period
+ */
+void ApplicationCache::setPeriod(ApplicationCache::Period period)
+{
+    switch (period) {
+    case Period::Always:
+        numDays = -1;
+        break;
+    case Period::Daily:
+        numDays = 1;
+        break;
+    case Period::Weekly:
+        numDays = 7;
+        break;
+    case Period::Monthly:
+        numDays = 31;
+        break;
+    case Period::Yearly:
+        numDays = 365;
+        break;
+    case Period::Never:
+        numDays = INT_MAX;
+        break;
+    }
+}
+
+/*!
+ * \brief ApplicationCache::setLimit
+ * Set the limit in bytes to perform a check
+ * \param value
+ */
+void ApplicationCache::setLimit(qint64 value)
+{
+    limit = value;
+}
+
+/*!
+ * \brief ApplicationCache::periodicCheckOfSize
+ * Checks if the periodic check should be performed now
+ * \return
+ */
+bool ApplicationCache::periodicCheckOfSize() const
+{
+    QString vendor = QString::fromLatin1(App::Application::Config()["ExeVendor"].c_str());
+    QString application = QString::fromStdString(App::Application::getExecutableName());
+
+    QSettings settings(vendor, application);
+    QString key = QString::fromLatin1("LastCacheCheck");
+    QDate date = settings.value(key).toDate();
+    QDate now = QDate::currentDate();
+
+    // get the days since the last check
+    int days = date.daysTo(now);
+    if (date.isNull()) {
+        days = 1000;
+    }
+
+    if (days >= numDays) {
+        settings.setValue(key, now);
+        return true;
+    }
+
+    return false;
+}
+
+/*!
+ * \brief ApplicationCache::performAction
+ * If the cache size \a total is higher than the limit then show a dialog to the user
+ * \param total
+ */
+bool ApplicationCache::performAction(qint64 total)
+{
+    bool performed = false;
+    if (total > limit) {
+        QString path = QString::fromStdString(App::Application::getUserCachePath());
+        QMessageBox msgBox(Gui::getMainWindow());
+        msgBox.setIcon(QMessageBox::Warning);
+        msgBox.setWindowTitle(tr("Cache directory"));
+
+        QString hint = tr("The cache directory %1 exceeds the size of %2.").arg(path, ApplicationCache::toString(limit));
+        QString ask = tr("Do you want to clear it now?");
+        QString warn = tr("Warning: Please make sure that this is the only running %1 instance "
+                          "and that no documents are opened as this may result into data loss!").arg(QCoreApplication::applicationName());
+
+        msgBox.setText(QString::fromLatin1("%1 %2\n\n\n%3").arg(hint, ask, warn));
+        msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No | QMessageBox::Open);
+        msgBox.setDefaultButton(QMessageBox::No);
+
+        while (true) {
+            int ret = msgBox.exec();
+            if (ret == QMessageBox::Open) {
+                QUrl url = QUrl::fromLocalFile(path);
+                QDesktopServices::openUrl(url);
+            }
+            else {
+                if (ret == QMessageBox::Yes) {
+                    clearDirectory(path);
+                    performed = true;
+                }
+                break;
+            }
+        }
+    }
+
+    return performed;
+}
+
+/*!
+ * \brief ApplicationCache::size
+ * Determines the size of the cache.
+ * \return
+ */
+qint64 ApplicationCache::size() const
+{
+    // QDirIterator lists some directories twice
+#if 0
+    QDir cache = QString::fromStdString(App::Application::getUserCachePath());
+    QDirIterator it(cache, QDirIterator::Subdirectories);
+    qint64 total = 0;
+    while (it.hasNext()) {
+        it.next();
+        total += it.fileInfo().size();
+    }
+
+    return total;
+#else
+    qint64 total = dirSize(QString::fromStdString(App::Application::getUserCachePath()));
+    return total;
+#endif
+}
+
+/*!
+ * \internal
+ */
+void ApplicationCache::clearDirectory(const QString& path)
+{
+    // Add the transient directories and the lock files to the ignore list
+    QDir tmp = QString::fromUtf8(App::Application::getUserCachePath().c_str());
+    tmp.setNameFilters(QStringList() << QString::fromLatin1("*.lock"));
+    tmp.setFilter(QDir::Files);
+
+    QList<QFileInfo> dirs;
+    std::vector<App::Document*> docs = App::GetApplication().getDocuments();
+    for (auto it : docs) {
+        QDir dir(QString::fromStdString(it->TransientDir.getStrValue()));
+        QFileInfo fi(dir.absolutePath());
+        dirs.append(fi);
+    }
+
+    DocumentRecoveryCleaner cleaner;
+    cleaner.setIgnoreFiles(tmp.entryList());
+    cleaner.setIgnoreDirectories(dirs);
+    cleaner.clearDirectory(QFileInfo(path));
+}
+
+/*!
+ * \internal
+ */
+qint64 ApplicationCache::dirSize(QString dirPath) const
+{
+    qint64 total = 0;
+    QDir dir(dirPath);
+
+    QDir::Filters fileFilters = QDir::Files;
+    for (QString filePath : dir.entryList(fileFilters)) {
+        QFileInfo fi(dir, filePath);
+        total += fi.size();
+    }
+
+    // traverse sub-directories recursively
+    QDir::Filters dirFilters = QDir::Dirs | QDir::NoDotAndDotDot;
+    for (QString subDirPath : dir.entryList(dirFilters))
+        total += dirSize(dirPath + QDir::separator() + subDirPath);
+    return total;
+}
+
+/*!
+ * \brief ApplicationCache::applyUserSettings
+ * Set period and limit according to user settings
+ */
+void ApplicationCache::applyUserSettings()
+{
+    int period = ApplicationCacheSettings::getCheckPeriod();
+    setPeriod(static_cast<Period>(period));
+
+    unsigned int sizeInMB = ApplicationCacheSettings::getCacheSizeLimit();
+    setLimit(ApplicationCache::toBytes(sizeInMB));
+}
+
+qint64 ApplicationCache::toBytes(unsigned int sizeInMB)
+{
+    qint64 value = static_cast<qint64>(sizeInMB) * 1024 * 1024;
+    return value;
+}
+
+QString ApplicationCache::toString(qint64 size)
+{
+    QStringList units = {QString::fromLatin1("Bytes"),
+                         QString::fromLatin1("KB"),
+                         QString::fromLatin1("MB"),
+                         QString::fromLatin1("GB")};
+    int i;
+    double outputSize = size;
+    for (i=0; i<units.size()-1; i++) {
+        if (outputSize < 1024)
+            break;
+        outputSize /= 1024;
+    }
+
+    return QString::fromLatin1("%1 %2").arg(QLocale().toString(outputSize, 'f', 2), units[i]);
+}
+
+// ----------------------------------------------------------------------------
+
+unsigned int ApplicationCacheSettings::getCacheSizeLimit()
+{
+    ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("CacheDirectory");
+    return hGrp->GetUnsigned("Limit", 500);
+}
+
+void ApplicationCacheSettings::setCacheSizeLimit(unsigned int limit)
+{
+    ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("CacheDirectory");
+    hGrp->SetUnsigned("Limit", limit);
+}
+
+int ApplicationCacheSettings::getCheckPeriod()
+{
+    ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("CacheDirectory");
+    return hGrp->GetInt("Period", static_cast<int>(ApplicationCache::Period::Weekly));
+}
+
+void ApplicationCacheSettings::setCheckPeriod(int period)
+{
+    ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("CacheDirectory");
+    hGrp->SetInt("Period", period);
+}
+
+
+#include "moc_DlgSettingsCacheDirectory.cpp"

src/Gui/DlgSettingsCacheDirectory.h

@@ -0,0 +1,109 @@
+/***************************************************************************
+ *   Copyright (c) 2021 Werner Mayer <wmayer[at]users.sourceforge.net>     *
+ *                                                                         *
+ *   This file is part of the FreeCAD CAx development system.              *
+ *                                                                         *
+ *   This library is free software; you can redistribute it and/or         *
+ *   modify it under the terms of the GNU Library General Public           *
+ *   License as published by the Free Software Foundation; either          *
+ *   version 2 of the License, or (at your option) any later version.      *
+ *                                                                         *
+ *   This library  is distributed in the hope that it will be useful,      *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU Library General Public License for more details.                  *
+ *                                                                         *
+ *   You should have received a copy of the GNU Library General Public     *
+ *   License along with this library; see the file COPYING.LIB. If not,    *
+ *   write to the Free Software Foundation, Inc., 59 Temple Place,         *
+ *   Suite 330, Boston, MA  02111-1307, USA                                *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#ifndef GUI_DIALOG_DLGSETTINGSCACHEDIRECTORY_H
+#define GUI_DIALOG_DLGSETTINGSCACHEDIRECTORY_H
+
+#include "PropertyPage.h"
+#include <memory>
+
+namespace Gui {
+namespace Dialog {
+class Ui_DlgSettingsCacheDirectory;
+
+/**
+ * The DlgSettingsCacheDirectory class implements a preference page to change settings
+ * for the cache directory handling.
+ * @author Werner Mayer
+ */
+class DlgSettingsCacheDirectory : public PreferencePage
+{
+    Q_OBJECT
+
+public:
+    DlgSettingsCacheDirectory(QWidget* parent = nullptr);
+    ~DlgSettingsCacheDirectory();
+
+    void saveSettings();
+    void loadSettings();
+
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    void runCheck();
+    void openDirectory();
+    void setCurrentCacheSize(const QString&);
+
+private:
+    static QString currentSize;
+    std::unique_ptr<Ui_DlgSettingsCacheDirectory> ui;
+};
+
+class ApplicationCache : public QObject
+{
+    Q_OBJECT
+
+public:
+    enum class Period {
+        Always,
+        Daily,
+        Weekly,
+        Monthly,
+        Yearly,
+        Never
+    };
+
+    ApplicationCache();
+    void applyUserSettings();
+    void setPeriod(Period);
+    void setLimit(qint64);
+    bool periodicCheckOfSize() const;
+    qint64 size() const;
+    bool performAction(qint64);
+
+    static QString toString(qint64 size);
+    static qint64 toBytes(unsigned int);
+
+private:
+    void clearDirectory(const QString& path);
+    qint64 dirSize(QString dirPath) const;
+
+private:
+    qint64 limit;
+    int numDays;
+};
+
+class ApplicationCacheSettings
+{
+public:
+    static unsigned int getCacheSizeLimit();
+    static void setCacheSizeLimit(unsigned int);
+    static int getCheckPeriod();
+    static void setCheckPeriod(int);
+};
+
+} // namespace Dialog
+} // namespace Gui
+
+#endif // GUI_DIALOG_DLGSETTINGSCACHEDIRECTORY_H

src/Gui/DlgSettingsCacheDirectory.ui

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Gui::Dialog::DlgSettingsCacheDirectory</class>
+ <widget class="QWidget" name="Gui::Dialog::DlgSettingsCacheDirectory">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>488</width>
+    <height>360</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Cache</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="GroupBox5">
+     <property name="title">
+      <string>Cache directory</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0" colspan="3">
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Location:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" colspan="2">
+         <widget class="QLineEdit" name="cacheLocation">
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="3">
+         <widget class="QPushButton" name="openButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="icon">
+           <iconset resource="Icons/resource.qrc">
+            <normaloff>:/icons/document-open.svg</normaloff>:/icons/document-open.svg</iconset>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="labelPeriod">
+          <property name="text">
+           <string>Check periodically at program start:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>118</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="2" colspan="2">
+         <widget class="QComboBox" name="comboBoxPeriod">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>Always</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Daily</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Weekly</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Monthly</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Yearly</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Never</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="labelCache">
+          <property name="text">
+           <string>Cache size limit:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <spacer name="horizontalSpacer_4">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>118</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="2" column="2" colspan="2">
+         <widget class="QComboBox" name="comboBoxLimit">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="labelCurrentCache">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string notr="true">Current cache size:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="pushButtonCheck">
+        <property name="text">
+         <string>Check now...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>150</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>169</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources>
+  <include location="Icons/resource.qrc"/>
+ </resources>
+ <connections/>
+</ui>

src/Gui/DocumentRecovery.cpp

@@ -42,6 +42,7 @@
 # include <QTextStream>
 # include <QTreeWidgetItem>
 # include <QMap>
+# include <QSet>
 # include <QList>
 # include <QVector>
 # include <sstream>
@@ -63,6 +64,7 @@
 #include <Gui/MainWindow.h>
 
 #include <QDomDocument>
+#include <QDirIterator>
 #include <boost/interprocess/sync/file_lock.hpp>
 
 FC_LOG_LEVEL_INIT("Gui",true,true)
@@ -335,7 +337,7 @@ void DocumentRecovery::accept()
                             << docs[i]->Label.getValue() << "'");
                 }
                 else {
-                    clearDirectory(xfi.absolutePath());
+                    DocumentRecoveryCleaner().clearDirectory(xfi.absolutePath());
                     QDir().rmdir(xfi.absolutePath());
                 }
 
@@ -519,13 +521,13 @@ void DocumentRecovery::onDeleteSection()
         return;
 
     QList<QTreeWidgetItem*> items = d_ptr->ui.treeWidget->selectedItems();
-    QDir tmp = QString::fromUtf8(App::Application::getTempPath().c_str());
+    QDir tmp = QString::fromUtf8(App::Application::getUserCachePath().c_str());
     for (QList<QTreeWidgetItem*>::iterator it = items.begin(); it != items.end(); ++it) {
         int index = d_ptr->ui.treeWidget->indexOfTopLevelItem(*it);
         QTreeWidgetItem* item = d_ptr->ui.treeWidget->takeTopLevelItem(index);
 
         QString projectFile = item->toolTip(0);
-        clearDirectory(QFileInfo(tmp.filePath(projectFile)));
+        DocumentRecoveryCleaner().clearDirectory(QFileInfo(tmp.filePath(projectFile)));
         tmp.rmdir(projectFile);
         delete item;
     }
@@ -564,44 +566,21 @@ void DocumentRecovery::cleanup(QDir& tmp, const QList<QFileInfo>& dirs, const QS
 {
     if (!dirs.isEmpty()) {
         for (QList<QFileInfo>::const_iterator jt = dirs.cbegin(); jt != dirs.cend(); ++jt) {
-            clearDirectory(*jt);
+            DocumentRecoveryCleaner().clearDirectory(*jt);
             tmp.rmdir(jt->fileName());
         }
     }
     tmp.remove(lockFile);
 }
 
-void DocumentRecovery::clearDirectory(const QFileInfo& dir)
-{
-    QDir qThisDir(dir.absoluteFilePath());
-    if (!qThisDir.exists())
-        return;
-
-    // Remove all files in this directory
-    qThisDir.setFilter(QDir::Files);
-    QStringList files = qThisDir.entryList();
-    for (QStringList::iterator it = files.begin(); it != files.end(); ++it) {
-        QString file = *it;
-        qThisDir.remove(file);
-    }
-
-    // Clear this directory of any sub-directories
-    qThisDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
-    QFileInfoList subdirs = qThisDir.entryInfoList();
-    for (QFileInfoList::iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
-        clearDirectory(*it);
-        qThisDir.rmdir(it->fileName());
-    }
-}
-
 // ----------------------------------------------------------------------------
 
-void DocumentRecoveryFinder::checkForPreviousCrashes()
+bool DocumentRecoveryFinder::checkForPreviousCrashes()
 {
     DocumentRecoveryHandler handler;
     handler.checkForPreviousCrashes(std::bind(&DocumentRecoveryFinder::checkDocumentDirs, this, sp::_1, sp::_2, sp::_3));
 
-    showRecoveryDialogIfNeeded();
+    return showRecoveryDialogIfNeeded();
 }
 
 void DocumentRecoveryFinder::checkDocumentDirs(QDir& tmp, const QList<QFileInfo>& dirs, const QString& fn)
@@ -649,20 +628,25 @@ void DocumentRecoveryFinder::checkDocumentDirs(QDir& tmp, const QList<QFileInfo>
     }
 }
 
-void DocumentRecoveryFinder::showRecoveryDialogIfNeeded()
+bool DocumentRecoveryFinder::showRecoveryDialogIfNeeded()
 {
+    bool foundRecoveryFiles = false;
     if (!restoreDocFiles.isEmpty()) {
         Gui::Dialog::DocumentRecovery dlg(restoreDocFiles, Gui::getMainWindow());
-        if (dlg.foundDocuments())
+        if (dlg.foundDocuments()) {
+            foundRecoveryFiles = true;
             dlg.exec();
+        }
     }
+
+    return foundRecoveryFiles;
 }
 
 // ----------------------------------------------------------------------------
 
 void DocumentRecoveryHandler::checkForPreviousCrashes(const std::function<void(QDir&, const QList<QFileInfo>&, const QString&)> & callableFunc) const
 {
-    QDir tmp = QString::fromUtf8(App::Application::getTempPath().c_str());
+    QDir tmp = QString::fromUtf8(App::Application::getUserCachePath().c_str());
     tmp.setNameFilters(QStringList() << QString::fromLatin1("*.lock"));
     tmp.setFilter(QDir::Files);
 
@@ -692,4 +676,60 @@ void DocumentRecoveryHandler::checkForPreviousCrashes(const std::function<void(Q
     }
 }
 
+// ----------------------------------------------------------------------------
+
+void DocumentRecoveryCleaner::clearDirectory(const QFileInfo& dir)
+{
+    QDir qThisDir(dir.absoluteFilePath());
+    if (!qThisDir.exists())
+        return;
+
+    // Remove all files in this directory
+    qThisDir.setFilter(QDir::Files);
+    QStringList files = qThisDir.entryList();
+    subtractFiles(files);
+    for (QStringList::iterator it = files.begin(); it != files.end(); ++it) {
+        QString file = *it;
+        qThisDir.remove(file);
+    }
+
+    // Clear this directory of any sub-directories
+    qThisDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+    QFileInfoList subdirs = qThisDir.entryInfoList();
+    subtractDirs(subdirs);
+    for (QFileInfoList::iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
+        clearDirectory(*it);
+        qThisDir.rmdir(it->fileName());
+    }
+}
+
+void DocumentRecoveryCleaner::subtractFiles(QStringList& files)
+{
+    if (!ignoreFiles.isEmpty() && !files.isEmpty()) {
+        QSet<QString> set1 = files.toSet();
+        QSet<QString> set2 = ignoreFiles.toSet();
+        set1.subtract(set2);
+        files = set1.toList();
+    }
+}
+
+void DocumentRecoveryCleaner::subtractDirs(QFileInfoList& dirs)
+{
+    if (!ignoreDirs.isEmpty() && !dirs.isEmpty()) {
+        for (const auto& it : ignoreDirs) {
+            dirs.removeOne(it);
+        }
+    }
+}
+
+void DocumentRecoveryCleaner::setIgnoreFiles(const QStringList& list)
+{
+    ignoreFiles = list;
+}
+
+void DocumentRecoveryCleaner::setIgnoreDirectories(const QFileInfoList& list)
+{
+    ignoreDirs = list;
+}
+
 #include "moc_DocumentRecovery.cpp"

src/Gui/DocumentRecovery.h

@@ -28,6 +28,7 @@
 #include <QScopedPointer>
 #include <QList>
 #include <QFileInfo>
+#include <QFileInfoList>
 #include <string>
 #include <functional>
 
@@ -53,7 +54,6 @@ protected:
     void closeEvent(QCloseEvent*);
     void contextMenuEvent(QContextMenuEvent*);
     QString createProjectFile(const QString&);
-    void clearDirectory(const QFileInfo&);
     void cleanup(QDir&, const QList<QFileInfo>&, const QString&);
 
 protected Q_SLOTS:
@@ -69,11 +69,11 @@ private:
 
 class DocumentRecoveryFinder {
 public:
-    void checkForPreviousCrashes();
+    bool checkForPreviousCrashes();
 
 private:
     void checkDocumentDirs(QDir&, const QList<QFileInfo>&, const QString&);
-    void showRecoveryDialogIfNeeded();
+    bool showRecoveryDialogIfNeeded();
 
 private:
     QList<QFileInfo> restoreDocFiles;
@@ -84,6 +84,21 @@ public:
     void checkForPreviousCrashes(const std::function<void(QDir&, const QList<QFileInfo>&, const QString&)> & callableFunc) const;
 };
 
+class DocumentRecoveryCleaner {
+public:
+    void clearDirectory(const QFileInfo& dir);
+    void setIgnoreFiles(const QStringList&);
+    void setIgnoreDirectories(const QFileInfoList&);
+
+private:
+    void subtractFiles(QStringList&);
+    void subtractDirs(QFileInfoList&);
+
+private:
+    QStringList ignoreFiles;
+    QFileInfoList ignoreDirs;
+};
+
 } //namespace Dialog
 
 } //namespace Gui

src/Gui/Language/FreeCAD.ts

@@ -476,7 +476,7 @@ while doing a left or right click and move the mouse up or down</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Release date</source>
@@ -704,7 +704,7 @@ while doing a left or right click and move the mouse up or down</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -765,7 +765,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
@@ -920,7 +920,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -994,7 +994,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
@@ -1131,7 +1131,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
@@ -1231,7 +1231,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line transparency:</source>
@@ -1397,7 +1397,7 @@ If this is not ticked, then the property must be uniquely named, and it is acces
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pressing &lt;Tab&gt; will insert amount of defined indent size</source>
@@ -1592,7 +1592,7 @@ horizontal space in Python console</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1873,7 +1873,7 @@ Note: your changes will be applied when you next switch workbenches
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emissive color:</source>
@@ -2041,7 +2041,7 @@ Specify another directory, please.</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2107,7 +2107,7 @@ Specify another directory, please.</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>UUID:</source>
@@ -2264,7 +2264,7 @@ Specify another directory, please.</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Redirect internal Python errors to report view</source>
@@ -2428,7 +2428,7 @@ from Python console to Report view panel</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
@@ -2746,7 +2746,7 @@ bounding box size of the 3D object that is currently displayed.</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color-gradient settings</source>
@@ -3822,7 +3822,7 @@ Zoom step of &apos;1&apos; means a factor of 7.5 for every zoom step.</source>
     <name>Gui::Dialog::DlgTipOfTheDay</name>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -4645,7 +4645,7 @@ originally selected prior to opening this dialog</source>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>

src/Gui/Language/FreeCAD_cs.ts

@@ -2619,11 +2619,11 @@ but slower response to any scene changes.</translation>
     </message>
     <message>
       <source>Objects will be projected in orthographic projection</source>
-      <translation type="unfinished">Objects will be projected in orthographic projection</translation>
+      <translation>Objekty budou promítnuty v ortografické projekci</translation>
     </message>
     <message>
       <source>Objects will appear in a perspective projection</source>
-      <translation type="unfinished">Objects will appear in a perspective projection</translation>
+      <translation>Objekty se objeví v perspektivní projekci</translation>
     </message>
     <message>
       <source>Axis cross will be shown by default at file
@@ -2642,17 +2642,17 @@ opening or creation</source>
       <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>Oblast pro výběr prvků ve 3D zobrazení.
+Větší hodnota usnadňuje výběr věcí, ale znemožňuje výběr malých prvků.
                </translation>
     </message>
     <message>
       <source>This option is useful for troubleshooting graphics card and driver problems.
 
 Changing this option requires a restart of the application.</source>
-      <translation type="unfinished">This option is useful for troubleshooting graphics card and driver problems.
+      <translation>Tato volba je užitečná pro řešení problémů s grafickou kartou a s ovladačem.
 
-Changing this option requires a restart of the application.</translation>
+Změna této volby vyžaduje restart aplikace.</translation>
     </message>
     <message>
       <source>Use software OpenGL</source>
@@ -2660,7 +2660,7 @@ Changing this option requires a restart of the application.</translation>
     </message>
     <message>
       <source>What kind of multisample anti-aliasing is used</source>
-      <translation type="unfinished">What kind of multisample anti-aliasing is used</translation>
+      <translation>Jaký se používá druh vícenásobného antaliasování</translation>
     </message>
     <message>
       <source>Eye-to-eye distance used for stereo projections.
@@ -2953,7 +2953,7 @@ automatically run a file recovery when it is started.</translation>
     </message>
     <message>
       <source>How often a recovery file is written</source>
-      <translation type="unfinished">How often a recovery file is written</translation>
+      <translation>Jak často se zapisuje obnovovací soubor</translation>
     </message>
     <message>
       <source>A thumbnail will be stored when document is saved</source>
@@ -3009,15 +3009,15 @@ icon in the tree view to fully reload it.</translation>
     </message>
     <message>
       <source>Disable partial loading of external linked objects</source>
-      <translation type="unfinished">Disable partial loading of external linked objects</translation>
+      <translation>Zakázat částečné načítání externích propojených objektů</translation>
     </message>
     <message>
       <source>All documents that will be created will get the specified author name.
 Keep blank for anonymous.
 You can also use the form: John Doe &lt;john@doe.com&gt;</source>
-      <translation type="unfinished">All documents that will be created will get the specified author name.
-Keep blank for anonymous.
-You can also use the form: John Doe &lt;john@doe.com&gt;</translation>
+      <translation>Všechny dokumenty, které budou vytvořeny, budou mít zadané jméno autora
+Pro anonymní jméno ponechte prázdné.
+Můžete také použít tuto formu: John Doe &lt;john@doe.com&gt;</translation>
     </message>
     <message>
       <source>The field 'Last modified by' will be set to specified author when saving the file</source>
@@ -3292,7 +3292,7 @@ You can also use the form: John Doe &lt;[email protected]&gt;</translation>
     </message>
     <message>
       <source>Autoload?</source>
-      <translation type="unfinished">Autoload?</translation>
+      <translation>Automaticky načíst?</translation>
     </message>
     <message>
       <source>Load Now</source>
@@ -3860,7 +3860,7 @@ Zoom step of '1' means a factor of 7.5 for every zoom step.</translation>
     </message>
     <message>
       <source>Bottom color</source>
-      <translation type="unfinished">Bottom color</translation>
+      <translation>Dolní barva</translation>
     </message>
     <message>
       <source>Background will have selected color gradient</source>
@@ -3868,7 +3868,7 @@ Zoom step of '1' means a factor of 7.5 for every zoom step.</translation>
     </message>
     <message>
       <source>Top color</source>
-      <translation type="unfinished">Top color</translation>
+      <translation>Horní barva</translation>
     </message>
     <message>
       <source>Tree view</source>
@@ -3876,11 +3876,11 @@ Zoom step of '1' means a factor of 7.5 for every zoom step.</translation>
     </message>
     <message>
       <source>Background color for objects in tree view that are currently edited</source>
-      <translation type="unfinished">Background color for objects in tree view that are currently edited</translation>
+      <translation>Barva pozadí pro objekty ve stromovém zobrazení, které jsou aktuálně editovány</translation>
     </message>
     <message>
       <source>Background color for active containers in tree view</source>
-      <translation type="unfinished">Background color for active containers in tree view</translation>
+      <translation>Barva pozadí pro aktivní kontejnery ve stromovém zobrazení</translation>
     </message>
   </context>
   <context>
@@ -4505,31 +4505,31 @@ Sloupec "Status" ukazuje zda je možné dokument obnovit.</translation>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Sklon (kolem osy Y):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Stáčení (kolem osy x):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Zatáčení (kolem osy z):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Zatáčení (kolem osy z)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Sklon (kolem osy Y)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Stáčení (kolem osy x)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Eulerovy úhly (xy'z")</translation>
     </message>
   </context>
   <context>
@@ -4694,7 +4694,7 @@ Sloupec "Status" ukazuje zda je možné dokument obnovit.</translation>
     </message>
     <message>
       <source>&amp;Use Original Selections</source>
-      <translation type="unfinished">&amp;Use Original Selections</translation>
+      <translation>&amp;Použít původní výběr</translation>
     </message>
     <message>
       <source>Ignore dependencies and proceed with objects
@@ -5438,7 +5438,7 @@ V pravém pohledu jsou %2 body vybrány.</translation>
     </message>
     <message>
       <source>Object not found</source>
-      <translation type="unfinished">Object not found</translation>
+      <translation>Objekt nenalezen</translation>
     </message>
   </context>
   <context>
@@ -5772,7 +5772,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Recompute after commit</source>
-      <translation type="unfinished">Recompute after commit</translation>
+      <translation>Přepočítat po odevzdání</translation>
     </message>
     <message>
       <source>Remove</source>
@@ -6053,7 +6053,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bulharština</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6061,7 +6061,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Španělština, Argentina</translation>
     </message>
   </context>
   <context>
@@ -6866,7 +6866,7 @@ Další podrobnosti najdete v zobrazení Přehledu.</translation>
     </message>
     <message>
       <source>Create link group failed</source>
-      <translation type="unfinished">Create link group failed</translation>
+      <translation>Vytvoření skupiny odkazů selhalo</translation>
     </message>
     <message>
       <source>Create link failed</source>
@@ -6899,8 +6899,8 @@ Další podrobnosti najdete v zobrazení Přehledu.</translation>
     <message>
       <source>The property name or group name must only contain alpha numericals,
 underscore, and must not start with a digit.</source>
-      <translation type="unfinished">The property name or group name must only contain alpha numericals,
-underscore, and must not start with a digit.</translation>
+      <translation>Název vlastnosti nebo název skupiny musí obsahovat pouze alfanumerické znaky,
+podtržítko a nesmí začínat číslicí.</translation>
     </message>
     <message>
       <source>The property '%1' already exists in '%2'</source>
@@ -6940,15 +6940,15 @@ underscore, and must not start with a digit.</translation>
     </message>
     <message>
       <source>There are grouped transactions in the following documents with other preceding transactions</source>
-      <translation type="unfinished">There are grouped transactions in the following documents with other preceding transactions</translation>
+      <translation>V následujících dokumentech jsou seskupeny transakce s jinými předcházejícími transakcemi</translation>
     </message>
     <message>
       <source>Choose 'Yes' to roll back all preceding transactions.
 Choose 'No' to roll back in the active document only.
 Choose 'Abort' to abort</source>
-      <translation type="unfinished">Choose 'Yes' to roll back all preceding transactions.
-Choose 'No' to roll back in the active document only.
-Choose 'Abort' to abort</translation>
+      <translation>Zvolte 'Ano' pro vrácení všech předchozích transakcí.
+Zvolte 'Ne' pro vrácení pouze v aktivním dokumentu.
+Zvolte 'Přerušit' pro zrušení</translation>
     </message>
     <message>
       <source>Do you want to save your changes to document before closing?</source>
@@ -7028,7 +7028,7 @@ Fyzická cesta: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Dokument nelze uložit</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7036,27 +7036,27 @@ Fyzická cesta: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Vyskytl se problém při ukládání souboru. Může to být proto, že některé nadřazené složky neexistují, nebo nemáte dostatečná oprávnění, nebo z jiných důvodů. Podrobnosti o chybě:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Chcete uložit soubor s jiným názvem?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Dokument nebyl uložen</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Dokument%1 nelze uložit. Chcete zrušit jeho zavírání?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 dokument(y) nebyl(y) uložen(y)</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Některé dokumenty nelze uložit. Chcete zrušit uzavření?</translation>
     </message>
   </context>
   <context>
@@ -7445,7 +7445,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Change the draw style of the objects</source>
-      <translation type="unfinished">Change the draw style of the objects</translation>
+      <translation>Změnit styl kreslení objektů</translation>
     </message>
   </context>
   <context>
@@ -7513,7 +7513,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Expression actions</source>
-      <translation type="unfinished">Expression actions</translation>
+      <translation>Akce výrazu</translation>
     </message>
   </context>
   <context>
@@ -7769,7 +7769,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Create a link to the selected object(s)</source>
-      <translation type="unfinished">Create a link to the selected object(s)</translation>
+      <translation>Vytvořit odkaz na vybraný(é) objekt(y)</translation>
     </message>
   </context>
   <context>
@@ -7784,7 +7784,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Create a group of links</source>
-      <translation type="unfinished">Create a group of links</translation>
+      <translation>Vytvořit skupinu odkazů</translation>
     </message>
   </context>
   <context>
@@ -7799,7 +7799,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Create a sub-object or sub-element link</source>
-      <translation type="unfinished">Create a sub-object or sub-element link</translation>
+      <translation>Vytvořit odkaz na dílčí objekt nebo dílčí prvek</translation>
     </message>
   </context>
   <context>
@@ -7814,7 +7814,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Replace the selected object(s) with link</source>
-      <translation type="unfinished">Replace the selected object(s) with link</translation>
+      <translation>Nahradit vybraný(é) objekt(y) odkazem</translation>
     </message>
   </context>
   <context>
@@ -7840,11 +7840,11 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Select all links</source>
-      <translation type="unfinished">Select all links</translation>
+      <translation>Vybrat všechny odkazy</translation>
     </message>
     <message>
       <source>Select all links to the current selected object</source>
-      <translation type="unfinished">Select all links to the current selected object</translation>
+      <translation>Vybrat všechny odkazy na aktuálně vybraný objekt</translation>
     </message>
   </context>
   <context>
@@ -7855,11 +7855,11 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Go to linked object</source>
-      <translation type="unfinished">Go to linked object</translation>
+      <translation>Přejít na propojený objekt</translation>
     </message>
     <message>
       <source>Select the linked object and switch to its owner document</source>
-      <translation type="unfinished">Select the linked object and switch to its owner document</translation>
+      <translation>Vyberte propojený objekt a přepněte na vlastnický dokument</translation>
     </message>
   </context>
   <context>
@@ -7870,7 +7870,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Go to the deepest linked object</source>
-      <translation type="unfinished">Go to the deepest linked object</translation>
+      <translation>Přejít na nejhlubší propojený objekt</translation>
     </message>
     <message>
       <source>Select the deepest linked object and switch to its owner document</source>
@@ -7904,7 +7904,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Attach to a remotely running debugger</source>
-      <translation type="unfinished">Attach to a remotely running debugger</translation>
+      <translation>Připojit k vzdálenému debuggeru</translation>
     </message>
   </context>
   <context>
@@ -8437,11 +8437,11 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>&amp;Bounding box</source>
-      <translation type="unfinished">&amp;Bounding box</translation>
+      <translation>&amp;Ohraničující kvádr</translation>
     </message>
     <message>
       <source>Show selection bounding box</source>
-      <translation type="unfinished">Show selection bounding box</translation>
+      <translation>Zobrazit výběrový ohraničující kvádr</translation>
     </message>
   </context>
   <context>
@@ -8834,11 +8834,11 @@ Would you like to save the file with a different name?</translation>
     <name>StdCmdUserEditMode</name>
     <message>
       <source>Edit mode</source>
-      <translation type="unfinished">Edit mode</translation>
+      <translation>Režim úprav</translation>
     </message>
     <message>
       <source>Defines behavior when editing an object from tree</source>
-      <translation type="unfinished">Defines behavior when editing an object from tree</translation>
+      <translation>Definuje chování při úpravách objektu ze stromu</translation>
     </message>
   </context>
   <context>
@@ -9734,10 +9734,10 @@ Chcete dokument nyní uložit?</translation>
 Please check the Report View for more details.
 
 Do you still want to proceed?</source>
-      <translation type="unfinished">The document contains dependency cycles.
-Please check the Report View for more details.
+      <translation>Dokument obsahuje cykly závislostí.
+Prosím zkontrolujte zobrazení Zprávy více podrobností.
 
-Do you still want to proceed?</translation>
+Chcete pokračovat?</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_de.ts

@@ -3292,7 +3292,7 @@ Sie können auch das Formular verwenden: John Doe &lt;[email protected]&gt;</translat
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Verfügbare Arbeitsbereiche</translation>
     </message>
   </context>
   <context>
@@ -3507,7 +3507,7 @@ Drehteller: das Teil wird um die z-Achse gedreht.</translation>
     </message>
     <message>
       <source>New document scale</source>
-      <translation>Neue Dokumentskala</translation>
+      <translation>Maßstab für neue Dokumente</translation>
     </message>
     <message>
       <source>Sets camera zoom for new documents.
@@ -4491,31 +4491,31 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Nicken (um die y-Achse):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Rollen (um die x-Achse):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Gieren (um die z-Achse):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Gieren (um die z-Achse)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Nicken (um die y-Achse)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Rollen (um die x-Achse)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Eulerwinkel (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -4680,7 +4680,7 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>&amp;Use Original Selections</source>
-      <translation type="unfinished">&amp;Use Original Selections</translation>
+      <translation>Originalauswahl &amp;verwenden</translation>
     </message>
     <message>
       <source>Ignore dependencies and proceed with objects
@@ -6043,7 +6043,7 @@ Möchten Sie ein anderes Verzeichnis angeben?</translation>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bulgarisch</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6051,7 +6051,7 @@ Möchten Sie ein anderes Verzeichnis angeben?</translation>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Spanisch, Argentinien</translation>
     </message>
   </context>
   <context>
@@ -7019,7 +7019,7 @@ Physischer Pfad: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Dokument konnte nicht gespeichert werden</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7027,27 +7027,27 @@ Physischer Pfad: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Es gab ein Problem beim Speichern der Datei. Dies kann daran liegen, dass einige der übergeordneten Ordner nicht existieren, Sie nicht über ausreichende Berechtigungen verfügen oder aus anderen Gründen. Fehlerdetails:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Möchten Sie die Datei mit einem anderen Namen speichern?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Dokument nicht gespeichert</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Das Dokument%1 konnte nicht gespeichert werden. Möchtest du das Schließen abbrechen?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 Dokument(e) nicht gespeichert</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Einige Dokumente konnten nicht gespeichert werden. Möchtest du das Schließen abbrechen?</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_es-ES.ts

@@ -106,7 +106,7 @@
     </message>
     <message>
       <source>Clear measurement</source>
-      <translation>Borrar medición</translation>
+      <translation>Limpiar medición</translation>
     </message>
   </context>
   <context>
@@ -117,7 +117,7 @@
     </message>
     <message>
       <source>Toggle measurement</source>
-      <translation>Activar medición</translation>
+      <translation>Activa/desactiva la medición</translation>
     </message>
   </context>
   <context>
@@ -481,7 +481,7 @@ mientras hace clic con el botón izquierdo o derecho y mueve el ratón hacia arr
     </message>
     <message>
       <source>Release date</source>
-      <translation>Fecha de la versión</translation>
+      <translation>Fecha de lanzamiento</translation>
     </message>
     <message>
       <source>Copy to clipboard</source>
@@ -604,7 +604,7 @@ mientras hace clic con el botón izquierdo o derecho y mueve el ratón hacia arr
     </message>
     <message>
       <source>Offset</source>
-      <translation>Equidistancia</translation>
+      <translation>Desplazamiento</translation>
     </message>
     <message>
       <source>Clipping Y</source>
@@ -3304,7 +3304,7 @@ También puede utilizar el formulario: John Doe &lt;[email protected]&gt;</translatio
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Bancos de trabajo disponibles</translation>
     </message>
   </context>
   <context>
@@ -3668,11 +3668,11 @@ El paso de zoom de '1' significa un factor de 7.5 para cada paso de acercamiento
     </message>
     <message>
       <source>Auto switch to the 3D view containing the selected item</source>
-      <translation>Cambiar automáticamente a la vista 3D que contiene el elemento seleccionado</translation>
+      <translation>Cambia automáticamente a la vista 3D que contiene el elemento seleccionado</translation>
     </message>
     <message>
       <source>Auto expand tree item when the corresponding object is selected in 3D view</source>
-      <translation>Auto expandir el elemento del árbol cuando se selecciona el objeto correspondiente en la vista 3D</translation>
+      <translation>Auto expande el elemento del árbol cuando se selecciona el objeto correspondiente en la vista 3D</translation>
     </message>
     <message>
       <source>Preselect the object in 3D view when mouse over the tree item</source>
@@ -3680,7 +3680,7 @@ El paso de zoom de '1' significa un factor de 7.5 para cada paso de acercamiento
     </message>
     <message>
       <source>Record selection in tree view in order to go back/forward using navigation button</source>
-      <translation>Grabar selección en la vista de árbol para retroceder/avanzar usando el botón de navegación</translation>
+      <translation>Graba la selección en la vista de árbol para retroceder/avanzar usando el botón de navegación</translation>
     </message>
     <message>
       <source>Add checkboxes for selection in document tree</source>
@@ -4503,31 +4503,31 @@ La columna 'Estado' muestra si el documento puede ser recuperado.</translation>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Elevación (alrededor del eje y):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Balanceo (alrededor del eje x-):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Rumbo (alrededor del eje z):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Rumbo (alrededor del eje z)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Elevación (alrededor del eje y)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Balanceo (alrededor del eje x)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Ángulos de Euler (xy'z'')</translation>
     </message>
   </context>
   <context>
@@ -5220,7 +5220,7 @@ Desea guardar los cambios?</translation>
     </message>
     <message>
       <source>Toggles this dockable window</source>
-      <translation>Alterna esta ventana acopla-ble</translation>
+      <translation>Alterna esta ventana acoplable</translation>
     </message>
     <message>
       <source>Close All</source>
@@ -5951,7 +5951,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Afrikaans</source>
-      <translation>Africano</translation>
+      <translation>Africaans</translation>
     </message>
     <message>
       <source>Norwegian</source>
@@ -6051,7 +6051,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Búlgaro</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6059,7 +6059,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Español, Argentina</translation>
     </message>
   </context>
   <context>
@@ -7024,7 +7024,7 @@ Trayectoria física: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>No se pudo guardar el documento</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7032,27 +7032,27 @@ Trayectoria física: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Hubo un problema al intentar guardar el archivo. Esto puede deberse a que algunas de las carpetas matriz no existen, o no posee permisos suficientes, o por otras razones. Detalles del error:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+¿Desea guardar el archivo con un nombre diferente?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Documento no guardado</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>El documento%1 no se pudo guardar. ¿Desea cancelar cerrando?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 Documento(s) no guardados</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Algunos documentos no se han podido guardar. ¿Desea cancelar el cierre?</translation>
     </message>
   </context>
   <context>
@@ -7160,7 +7160,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Align the selected objects</source>
-      <translation>Alinear los objetos seleccionados</translation>
+      <translation>Alinea los objetos seleccionados</translation>
     </message>
   </context>
   <context>
@@ -7216,7 +7216,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Close active window</source>
-      <translation>Cerrar la ventana activa</translation>
+      <translation>Cierra la ventana activa</translation>
     </message>
   </context>
   <context>
@@ -7231,7 +7231,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Close all windows</source>
-      <translation>Cerrar todas las ventanas</translation>
+      <translation>Cierra todas las ventanas</translation>
     </message>
   </context>
   <context>
@@ -7321,7 +7321,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Show the dependency graph of the objects in the active document</source>
-      <translation>Mostrar el gráfico de dependencia de los objetos en el documento activo</translation>
+      <translation>Muestra el gráfico de dependencia de los objetos en el documento activo</translation>
     </message>
   </context>
   <context>
@@ -7456,7 +7456,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Put duplicates of the selected objects to the active document</source>
-      <translation>Ponga los duplicados de los objetos seleccionados en el documento activo</translation>
+      <translation>Pone los duplicados de los objetos seleccionados en el documento activo</translation>
     </message>
   </context>
   <context>
@@ -7490,7 +7490,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Export an object in the active document</source>
-      <translation>Exportar un objeto en el documento activo</translation>
+      <translation>Exporta un objeto en el documento activo</translation>
     </message>
     <message>
       <source>No selection</source>
@@ -7671,7 +7671,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Hide all objects in the document</source>
-      <translation>Ocultar todos los objetos en el documento</translation>
+      <translation>Oculta todos los objetos en el documento</translation>
     </message>
   </context>
   <context>
@@ -7686,7 +7686,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Hide all selected objects</source>
-      <translation>Ocultar todos los objetos seleccionados</translation>
+      <translation>Oculta todos los objetos seleccionados</translation>
     </message>
   </context>
   <context>
@@ -7701,7 +7701,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Import a file in the active document</source>
-      <translation>Importar un archivo en el documento activo</translation>
+      <translation>Importa un archivo en el documento activo</translation>
     </message>
     <message>
       <source>Supported formats</source>
@@ -8008,7 +8008,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Merge project</source>
-      <translation>Fusionar proyecto</translation>
+      <translation>Fusiona el proyecto</translation>
     </message>
     <message>
       <source>Cannot merge project with itself.</source>
@@ -8031,7 +8031,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Create a new empty document</source>
-      <translation>Crear un documento vacío nuevo</translation>
+      <translation>Crea un documento vacío nuevo</translation>
     </message>
     <message>
       <source>Unnamed</source>
@@ -8076,7 +8076,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Open a document or import files</source>
-      <translation>Abrir un documento o importar archivos</translation>
+      <translation>Abre un documento o importa archivos</translation>
     </message>
     <message>
       <source>Supported formats</source>
@@ -8152,7 +8152,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Print the document</source>
-      <translation>Imprimir el documento</translation>
+      <translation>Imprime el documento</translation>
     </message>
   </context>
   <context>
@@ -8167,7 +8167,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Export the document as PDF</source>
-      <translation>Exportar el documento como PDF</translation>
+      <translation>Exporta el documento como PDF</translation>
     </message>
   </context>
   <context>
@@ -8182,7 +8182,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Print the document</source>
-      <translation>Imprimir el documento</translation>
+      <translation>Imprime el documento</translation>
     </message>
     <message>
       <source>Print preview</source>
@@ -8201,7 +8201,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Show details of the currently active project</source>
-      <translation>Mostrar detalles del proyecto activo actual</translation>
+      <translation>Muestra detalles del proyecto activo actual</translation>
     </message>
   </context>
   <context>
@@ -8362,7 +8362,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Save all opened document</source>
-      <translation>Guardar todos los documentos abiertos</translation>
+      <translation>Guarda todos los documentos abiertos</translation>
     </message>
   </context>
   <context>
@@ -8377,7 +8377,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Save the active document under a new file name</source>
-      <translation>Guardar el documento activo con un nuevo nombre de archivo</translation>
+      <translation>Guarda el documento activo con un nombre de archivo nuevo</translation>
     </message>
   </context>
   <context>
@@ -8437,7 +8437,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Show selection bounding box</source>
-      <translation>Mostrar cuadro delimitador de selección</translation>
+      <translation>Muestra el cuadro delimitador de selección</translation>
     </message>
   </context>
   <context>
@@ -8467,7 +8467,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Select all</source>
-      <translation>Seleccionar todo</translation>
+      <translation>Selecciona todo</translation>
     </message>
   </context>
   <context>
@@ -8482,7 +8482,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Select visible objects in the active document</source>
-      <translation>Seleccione objetos visibles en el documento activo</translation>
+      <translation>Selecciona objetos visibles en el documento activo</translation>
     </message>
   </context>
   <context>
@@ -8527,7 +8527,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Show all objects in the document</source>
-      <translation>Mostrar todos los objetos en el documento</translation>
+      <translation>Muestra todos los objetos en el documento</translation>
     </message>
   </context>
   <context>
@@ -8542,7 +8542,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Show all selected objects</source>
-      <translation>Mostrar todos los objetos seleccionados</translation>
+      <translation>Muestra todos los objetos seleccionados</translation>
     </message>
   </context>
   <context>
@@ -8557,7 +8557,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Toggles the status bar</source>
-      <translation>Conmutar la barra de estado</translation>
+      <translation>Activa/desactiva la barra de estado</translation>
     </message>
   </context>
   <context>
@@ -8628,7 +8628,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Toggles clipping plane for active view</source>
-      <translation>Conmuta el plano de recorte para la vista activa</translation>
+      <translation>Conmuta el plano de corte para la vista activa</translation>
     </message>
   </context>
   <context>
@@ -8643,7 +8643,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Toggle between navigation and edit mode</source>
-      <translation>Alternar entre el modo de navegación y edición</translation>
+      <translation>Alterna entre el modo de navegación y edición</translation>
     </message>
   </context>
   <context>
@@ -8703,7 +8703,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Toggles this window</source>
-      <translation>Conmutar esta ventana</translation>
+      <translation>Alternar esta ventana</translation>
     </message>
   </context>
   <context>
@@ -8733,7 +8733,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Transform the selected object in the 3d view</source>
-      <translation>Transformar el objeto seleccionado en la vista 3D</translation>
+      <translation>Transforma el objeto seleccionado en la vista 3d</translation>
     </message>
   </context>
   <context>
@@ -8808,7 +8808,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Undo exactly one action</source>
-      <translation>Deshacer exactamente una acción</translation>
+      <translation>Deshace exactamente una acción</translation>
     </message>
   </context>
   <context>
@@ -8894,7 +8894,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to dimetric view</source>
-      <translation>Establecer vista dimétrica</translation>
+      <translation>Establece vista dimétrica</translation>
     </message>
   </context>
   <context>
@@ -8954,7 +8954,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Fits the whole content on the screen</source>
-      <translation>Ajustar el contenido completo a la pantalla</translation>
+      <translation>Ajusta el contenido completo a la pantalla</translation>
     </message>
   </context>
   <context>
@@ -8969,7 +8969,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Fits the selected content on the screen</source>
-      <translation>Ajustar el contenido seleccionado a la pantalla</translation>
+      <translation>Ajusta el contenido seleccionado a la pantalla</translation>
     </message>
   </context>
   <context>
@@ -8984,7 +8984,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to front view</source>
-      <translation>Establecer vista alzado</translation>
+      <translation>Establece vista de alzado</translation>
     </message>
   </context>
   <context>
@@ -8999,7 +8999,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to default home view</source>
-      <translation>Establecer como vista de inicio por defecto</translation>
+      <translation>Establece por defecto la vista de inicio</translation>
     </message>
   </context>
   <context>
@@ -9014,7 +9014,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to isometric view</source>
-      <translation>Establecer vista isométrica</translation>
+      <translation>Establece vista isométrica</translation>
     </message>
   </context>
   <context>
@@ -9029,7 +9029,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Issue the camera position to the console and to a macro, to easily recall this position</source>
-      <translation>Publicar la posición de la cámara a la consola y a una macro, para rellamar fácilmente a esta posición</translation>
+      <translation>Publica la posición de la cámara a la consola y a una macro, para reutilizar fácilmente esta posición</translation>
     </message>
   </context>
   <context>
@@ -9044,7 +9044,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Switch stereo viewing to Interleaved Columns</source>
-      <translation>Cambiar la visualización estéreo a columnas intercaladas</translation>
+      <translation>Cambia la visualización estéreo a columnas intercaladas</translation>
     </message>
   </context>
   <context>
@@ -9059,7 +9059,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Switch stereo viewing to Interleaved Rows</source>
-      <translation>Cambiar la visualización estéreo a filas intercaladas</translation>
+      <translation>Cambia la visualización estéreo a filas intercaladas</translation>
     </message>
   </context>
   <context>
@@ -9074,7 +9074,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Switch stereo viewing off</source>
-      <translation>Cambiar la visualización estereo a apagado</translation>
+      <translation>Apaga la visualización estereo</translation>
     </message>
   </context>
   <context>
@@ -9089,7 +9089,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Switch stereo viewing to quad buffer</source>
-      <translation>Cambiar la visualización estereo a cuádruple buffer</translation>
+      <translation>Cambia la visualización estereo a cuádruple buffer</translation>
     </message>
   </context>
   <context>
@@ -9104,7 +9104,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Switch stereo viewing to red/cyan</source>
-      <translation>Cambiar a visualización estereo rojo/cian</translation>
+      <translation>Cambia a visualización estereo rojo/cian</translation>
     </message>
   </context>
   <context>
@@ -9119,7 +9119,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to left view</source>
-      <translation>Establecer vista izquierda</translation>
+      <translation>Establece vista izquierda</translation>
     </message>
   </context>
   <context>
@@ -9134,7 +9134,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to rear view</source>
-      <translation>Establecer vista posterior</translation>
+      <translation>Establece vista posterior</translation>
     </message>
   </context>
   <context>
@@ -9164,7 +9164,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to right view</source>
-      <translation>Establecer vista derecha</translation>
+      <translation>Establece vista derecha</translation>
     </message>
   </context>
   <context>
@@ -9179,7 +9179,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Rotate the view by 90° counter-clockwise</source>
-      <translation>Girar la vista a 90° en sentido antihorario</translation>
+      <translation>Gira la vista a 90° en sentido antihorario</translation>
     </message>
   </context>
   <context>
@@ -9194,7 +9194,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Rotate the view by 90° clockwise</source>
-      <translation>Girar la vista a 90° en sentido horario</translation>
+      <translation>Gira la vista a 90° en sentido horario</translation>
     </message>
   </context>
   <context>
@@ -9224,7 +9224,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to top view</source>
-      <translation>Establecer vista en planta</translation>
+      <translation>Establece vista en planta</translation>
     </message>
   </context>
   <context>
@@ -9239,7 +9239,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Set to trimetric view</source>
-      <translation>Establecer vista trimétrica</translation>
+      <translation>Establece vista trimétrica</translation>
     </message>
   </context>
   <context>
@@ -9325,7 +9325,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Display the main window in fullscreen mode</source>
-      <translation>Mostrar la ventana principal en modo de pantalla completa</translation>
+      <translation>Muestra la ventana principal en modo de pantalla completa</translation>
     </message>
   </context>
   <context>
@@ -9340,7 +9340,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Switches to orthographic view mode</source>
-      <translation>Cambiar a modo de vista ortográfica</translation>
+      <translation>Cambia al modo de vista ortográfico</translation>
     </message>
   </context>
   <context>
@@ -9355,7 +9355,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Switches to perspective view mode</source>
-      <translation>Cambiar a modo de vista perspectiva</translation>
+      <translation>Cambia a modo de vista perspectiva</translation>
     </message>
   </context>
   <context>
@@ -9366,7 +9366,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Expand active document and collapse all others</source>
-      <translation>Expandir documento activo y colapsar todos los demás</translation>
+      <translation>Expande el documento activo y colapsa todos los demás</translation>
     </message>
     <message>
       <source>TreeView</source>
@@ -9385,14 +9385,14 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Initiate dragging of current selected tree items</source>
-      <translation>Iniciar el arrastre de los elementos del árbol seleccionados</translation>
+      <translation>Inicia el arrastre de los elementos del árbol seleccionados</translation>
     </message>
   </context>
   <context>
     <name>StdTreeMultiDocument</name>
     <message>
       <source>Display all documents in the tree view</source>
-      <translation>Mostrar todos los documentos en la vista de árbol</translation>
+      <translation>Muestra todos los documentos en la vista de árbol</translation>
     </message>
     <message>
       <source>TreeView</source>
@@ -9430,7 +9430,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Record selection in tree view in order to go back/forward using navigation button</source>
-      <translation>Grabar selección en la vista de árbol para retroceder/avanzar usando el botón de navegación</translation>
+      <translation>Graba la selección en la vista de árbol para retroceder/avanzar usando el botón de navegación</translation>
     </message>
   </context>
   <context>
@@ -9475,7 +9475,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Auto adjust placement on drag and drop objects across coordinate systems</source>
-      <translation>Ajustar automáticamente la colocación al arrastrar y soltar objetos a través de los sistemas de coordenadas</translation>
+      <translation>Ajusta automáticamente la posición al arrastrar y soltar objetos a través de los sistemas de coordenadas</translation>
     </message>
   </context>
   <context>
@@ -9490,7 +9490,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Auto expand tree item when the corresponding object is selected in 3D view</source>
-      <translation>Auto expandir el elemento del árbol cuando se selecciona el objeto correspondiente en la vista 3D</translation>
+      <translation>Auto expande el elemento del árbol cuando se selecciona el objeto correspondiente en la vista 3D</translation>
     </message>
   </context>
   <context>
@@ -9505,7 +9505,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Auto switch to the 3D view containing the selected item</source>
-      <translation>Cambiar automáticamente a la vista 3D que contiene el elemento seleccionado</translation>
+      <translation>Cambia automáticamente a la vista 3D que contiene el elemento seleccionado</translation>
     </message>
   </context>
   <context>
@@ -9531,7 +9531,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Display the active view either in fullscreen, in undocked or docked mode</source>
-      <translation>Mostrar la vista activa en pantalla completa, en modo desacoplado o acoplado</translation>
+      <translation>Muestra la vista activa a pantalla completa, en modo desacoplado o acoplado</translation>
     </message>
   </context>
   <context>
@@ -9546,7 +9546,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Display the active view either in fullscreen, in undocked or docked mode</source>
-      <translation>Mostrar la vista activa en pantalla completa, en modo desacoplado o acoplado</translation>
+      <translation>Muestra la vista activa a pantalla completa, en modo desacoplado o acoplado</translation>
     </message>
   </context>
   <context>
@@ -9561,7 +9561,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Display the active view either in fullscreen, in undocked or docked mode</source>
-      <translation>Mostrar la vista activa en pantalla completa, en modo desacoplado o acoplado</translation>
+      <translation>Muestra la vista activa a pantalla completa, en modo desacoplado o acoplado</translation>
     </message>
   </context>
   <context>
@@ -9591,7 +9591,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Display the active view either in fullscreen, in undocked or docked mode</source>
-      <translation>Mostrar la vista activa en pantalla completa, en modo desacoplado o acoplado</translation>
+      <translation>Muestra la vista activa a pantalla completa, en modo desacoplado o acoplado</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_eu.ts

@@ -3311,7 +3311,7 @@ Honako forma ere erabili dezakezu: Jon Inor &lt;[email protected]&gt;</translation>
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Lan-mahai erabilgarriak</translation>
     </message>
   </context>
   <context>
@@ -3939,7 +3939,7 @@ Zoom step of '1' means a factor of 7.5 for every zoom step.</source>
       <source>List of last used calculations 
 To add a calculation press Return in the value input field</source>
       <translation>Erabilitako azken kalkuluen zerrenda.
-Kalkulu bat gehitzeko, sakatu ⏎</translation>
+Kalkulu bat gehitzeko, sakatu ⏎ balioen sarrera-eremuan</translation>
     </message>
     <message>
       <source>Quantity</source>
@@ -4512,31 +4512,31 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Buruzkatzea (Y ardatzaren inguruan):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Kulunkada (X ardatzaren inguruan):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Keinada (Z ardatzaren inguruan):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Keinada (Z ardatzaren inguruan)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Buruzkatzea (Y ardatzaren inguruan)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Kulunkada (X ardatzaren inguruan)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Euler angeluak (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -6065,7 +6065,7 @@ Beste direktorio bat aukeratu nahi al duzu?</translation>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bulgariera</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6073,7 +6073,7 @@ Beste direktorio bat aukeratu nahi al duzu?</translation>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Espainiera, Argentina</translation>
     </message>
   </context>
   <context>
@@ -7041,7 +7041,7 @@ Bide-izen fisikoa: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Ezin da dokumentua gorde</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7049,27 +7049,27 @@ Bide-izen fisikoa: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Arazo bat dago fitxategia gordetzen saiatzean. Beharbada karpeta gurasoak ez dira existitzen edo ez duzu aski baimenik. Errorearen xehetasunak:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Fitxategia beste izen batekin gorde nahi al duzu?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Dokumentua ez da gorde</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>%1 dokumentua ezin izan da gorde. Hura ixtea bertan behera utzi nahi duzu?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 dokumentu ez dira gorde</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Zenbait dokumentu ezin izan dira gorde. Ixtea bertan behera utzi nahi duzu?</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_fr.ts

@@ -3305,7 +3305,7 @@ Vous pouvez également utiliser la forme : John Doe &lt;[email protected]&gt;</transl
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Ateliers disponibles</translation>
     </message>
   </context>
   <context>
@@ -4504,31 +4504,31 @@ La colonne « État » indique si le document peut être récupéré.</translati
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Tangage (autour de l'axe Y) :</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Roulis (autour de l'axe X) :</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Lacet (autour de l'axe Z) :</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Lacet (autour de l'axe Z)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Tangage (autour de l'axe Y)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Roulis (autour de l'axe X)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Angle d'Euler (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -6051,7 +6051,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bulgare</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6059,7 +6059,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Espagnol, Argentine</translation>
     </message>
   </context>
   <context>
@@ -7024,7 +7024,7 @@ Chemin physique : </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Impossible d'enregistrer le document</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7032,27 +7032,27 @@ Chemin physique : </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Un problème est survenu lors de l'enregistrement du fichier. Cela peut être dû au fait que certains dossiers parents n'existent pas, ou que vous n'avez pas les autorisations suffisantes, ou pour d'autres raisons. Détails de l'erreur :
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Voulez-vous enregistrer le fichier avec un nom différent ?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Document non enregistré</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Le document%1 n'a pas pu être enregistré. Voulez-vous annuler sa fermeture ?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>Document(s) %1 non enregistré(s)</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Certains documents n'ont pas pu être enregistrés. Voulez-vous annuler la fermeture ?</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_hr.ts

@@ -524,17 +524,19 @@ while doing a left or right click and move the mouse up or down</source>
     </message>
     <message>
       <source>FreeCAD would not be possible without the contributions of</source>
-      <translation type="unfinished">FreeCAD would not be possible without the contributions of</translation>
+      <translation>FreeCAD-a ne bi bilo bez doprinosa
+
+</translation>
     </message>
     <message>
       <source>Individuals</source>
       <extracomment>Header for the list of individual people in the Credits list.</extracomment>
-      <translation type="unfinished">Individuals</translation>
+      <translation>Pojedinci</translation>
     </message>
     <message>
       <source>Organizations</source>
       <extracomment>Header for the list of companies/organizations in the Credits list.</extracomment>
-      <translation type="unfinished">Organizations</translation>
+      <translation>Organizacije</translation>
     </message>
   </context>
   <context>
@@ -1441,7 +1443,7 @@ Ako se to ne označi, osobina mora biti jedinstveno imenovana i njoj se pristupa
     </message>
     <message>
       <source>Code lines will be numbered</source>
-      <translation type="unfinished">Code lines will be numbered</translation>
+      <translation>Redovi koda bit će numerirani</translation>
     </message>
   </context>
   <context>
@@ -2687,15 +2689,15 @@ Za promjenu ove opcije potrebno je ponovno pokretanje aplikacije.
     </message>
     <message>
       <source>What kind of multisample anti-aliasing is used</source>
-      <translation type="unfinished">What kind of multisample anti-aliasing is used</translation>
+      <translation>Kakva vrsta višestrukih uzoraka se koristi</translation>
     </message>
     <message>
       <source>Eye-to-eye distance used for stereo projections.
 The specified value is a factor that will be multiplied with the
 bounding box size of the 3D object that is currently displayed.</source>
-      <translation type="unfinished">Eye-to-eye distance used for stereo projections.
-The specified value is a factor that will be multiplied with the
-bounding box size of the 3D object that is currently displayed.</translation>
+      <translation>Udaljenost od oka do oka koja se koristi za stereo projekcije.
+Navedena vrijednost je faktor koji će se pomnožiti s
+veličinom graničnog okvira 3D objekta koji se trenutno prikazuje.</translation>
     </message>
   </context>
   <context>
@@ -3320,23 +3322,25 @@ Možete koristiti i obrazac: John Doe &lt;[email protected]&gt;
     <name>Gui::Dialog::DlgSettingsLazyLoaded</name>
     <message>
       <source>Workbench Name</source>
-      <translation type="unfinished">Workbench Name</translation>
+      <translation>Ime radne površine</translation>
     </message>
     <message>
       <source>Autoload?</source>
-      <translation type="unfinished">Autoload?</translation>
+      <translation>Automatsko učitavanje?
+
+</translation>
     </message>
     <message>
       <source>Load Now</source>
-      <translation type="unfinished">Load Now</translation>
+      <translation>Učitaj sada</translation>
     </message>
     <message>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kako bi sačuvao resurse, FreeCAD ne učitava radne površine dok se ne koriste. Njihovo učitavanje može omogućiti pristup dodatnim postavkama koje se odnose na njihovu funkcionalnost.&lt;/p&gt;&lt;p&gt;Sljedeći radni stolovi dostupni su u vašoj instalaciji:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Dostupne radne površine</translation>
     </message>
   </context>
   <context>
@@ -3347,27 +3351,29 @@ Možete koristiti i obrazac: John Doe &lt;[email protected]&gt;
     </message>
     <message>
       <source>Autoload</source>
-      <translation type="unfinished">Autoload</translation>
+      <translation>Automatsko učitavanje</translation>
     </message>
     <message>
       <source>If checked</source>
-      <translation type="unfinished">If checked</translation>
+      <translation>Ako je označeno</translation>
     </message>
     <message>
       <source>will be loaded automatically when FreeCAD starts up</source>
-      <translation type="unfinished">will be loaded automatically when FreeCAD starts up</translation>
+      <translation>ovo će se automatski učitati kada se FreeCAD pokrene
+
+</translation>
     </message>
     <message>
       <source>This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.</source>
-      <translation type="unfinished">This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.</translation>
+      <translation>Ovo je trenutni modul za pokretanje i mora se automatski učitati. Za promjenu pogledajte Postavke/Općenito/Automatsko učitavanje.</translation>
     </message>
     <message>
       <source>Loaded</source>
-      <translation type="unfinished">Loaded</translation>
+      <translation>Učitano</translation>
     </message>
     <message>
       <source>Load now</source>
-      <translation type="unfinished">Load now</translation>
+      <translation>Učitaj sada</translation>
     </message>
   </context>
   <context>
@@ -3685,25 +3691,27 @@ Naginjanje miša nije onemogućeno ovom postavkom.</translation>
     </message>
     <message>
       <source>Rotates to nearest possible state when clicking a cube face</source>
-      <translation type="unfinished">Rotates to nearest possible state when clicking a cube face</translation>
+      <translation>Rotira se u najbliže moguće stanje kada kliknete lice kocke
+
+</translation>
     </message>
     <message>
       <source>Rotate to nearest</source>
-      <translation type="unfinished">Rotate to nearest</translation>
+      <translation>Rotira se u najbliže</translation>
     </message>
     <message>
       <source>Cube size</source>
-      <translation type="unfinished">Cube size</translation>
+      <translation>Veličina kocke</translation>
     </message>
     <message>
       <source>Size of the navigation cube</source>
-      <translation type="unfinished">Size of the navigation cube</translation>
+      <translation>Veličina kocke navigacije</translation>
     </message>
     <message>
       <source>How much will be zoomed.
 Zoom step of '1' means a factor of 7.5 for every zoom step.</source>
-      <translation type="unfinished">How much will be zoomed.
-Zoom step of '1' means a factor of 7.5 for every zoom step.</translation>
+      <translation>Koliko će se zumirati.
+Korak zumiranja '1' znači faktor 7,5 za svaki korak zumiranja.</translation>
     </message>
   </context>
   <context>
@@ -3731,7 +3739,7 @@ Zoom step of '1' means a factor of 7.5 for every zoom step.</translation>
     </message>
     <message>
       <source>Add checkboxes for selection in document tree</source>
-      <translation type="unfinished">Add checkboxes for selection in document tree</translation>
+      <translation>Dodajte potvrdne okvire za odabir u stablu dokumenta</translation>
     </message>
   </context>
   <context>
@@ -4554,31 +4562,31 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Otklon (oko osi Y):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Okretanje (oko osi X):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Zakretanje (oko osi Z):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Zakretanje (oko osi Z)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Otklon (oko osi Y)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Okretanje (oko osi X)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Eulerovih kuteva (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -4744,13 +4752,13 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>&amp;Use Original Selections</source>
-      <translation type="unfinished">&amp;Use Original Selections</translation>
+      <translation>&amp;Koristi originalnu selekciju</translation>
     </message>
     <message>
       <source>Ignore dependencies and proceed with objects
 originally selected prior to opening this dialog</source>
-      <translation type="unfinished">Ignore dependencies and proceed with objects
-originally selected prior to opening this dialog</translation>
+      <translation>Zanemarite ovisnosti i nastavite s objektima
+izvorno odabranim prije otvaranja ovog dijaloškog okvira</translation>
     </message>
   </context>
   <context>
@@ -6108,7 +6116,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bugarski</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6116,7 +6124,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>španjolski, Argentina</translation>
     </message>
   </context>
   <context>
@@ -7069,7 +7077,7 @@ Document: </source>
     </message>
     <message>
       <source>There were serious errors while loading the file. Some data might have been modified or not recovered at all. Saving the project will most likely result in loss of data.</source>
-      <translation type="unfinished">There were serious errors while loading the file. Some data might have been modified or not recovered at all. Saving the project will most likely result in loss of data.</translation>
+      <translation>Došlo je do ozbiljnih pogrešaka prilikom učitavanja datoteke. Neki su podaci možda izmijenjeni ili uopće nisu vraćeni. Spremanje projekta najvjerojatnije će rezultirati gubitkom podataka.</translation>
     </message>
     <message>
       <source>Workbenches</source>
@@ -7079,13 +7087,11 @@ Document: </source>
       <source>
 
 Physical path: </source>
-      <translation type="unfinished">
-
-Physical path: </translation>
+      <translation>Fizički put:</translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Ne mogu spremiti dokument</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7093,27 +7099,29 @@ Physical path: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Došlo je do problema pri pokušaju spremanja datoteke. To može biti zato što neke od nadređenih mapa ne postoje, ili nemate dovoljna dopuštenja ili iz drugih razloga. Detalji o grešci:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Želite li datoteku spremiti pod drugim imenom?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Dokument nije spremljen</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Dokument%1 nije bilo moguće spremiti. Želite li otkazati zatvaranje?
+
+</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 dokument(a) nije spremljeno</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Neke dokumente nije bilo moguće spremiti. Želite li otkazati zatvaranje?</translation>
     </message>
   </context>
   <context>
@@ -7561,7 +7569,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Select the objects to export before choosing Export.</source>
-      <translation type="unfinished">Select the objects to export before choosing Export.</translation>
+      <translation>Odaberite objekte za izvoz prije nego što odaberete Izvoz.</translation>
     </message>
   </context>
   <context>
@@ -7602,7 +7610,9 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Donate to FreeCAD development</source>
-      <translation type="unfinished">Donate to FreeCAD development</translation>
+      <translation>Donirajte razvoju FreeCAD-a
+
+</translation>
     </message>
   </context>
   <context>
@@ -7711,7 +7721,7 @@ Would you like to save the file with a different name?</translation>
     <name>StdCmdGroup</name>
     <message>
       <source>Structure</source>
-      <translation>Struktura</translation>
+      <translation>Konstrukcija</translation>
     </message>
     <message>
       <source>Create group</source>
@@ -8165,7 +8175,7 @@ Would you like to save the file with a different name?</translation>
     <name>StdCmdPart</name>
     <message>
       <source>Structure</source>
-      <translation>Struktura</translation>
+      <translation>Konstrukcija</translation>
     </message>
     <message>
       <source>Create part</source>
@@ -8900,11 +8910,11 @@ Would you like to save the file with a different name?</translation>
     <name>StdCmdUserEditMode</name>
     <message>
       <source>Edit mode</source>
-      <translation type="unfinished">Edit mode</translation>
+      <translation>Način uređivanja</translation>
     </message>
     <message>
       <source>Defines behavior when editing an object from tree</source>
-      <translation type="unfinished">Defines behavior when editing an object from tree</translation>
+      <translation>Definira ponašanje prilikom uređivanja objekta iz stabla</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_hu.ts

@@ -3303,7 +3303,7 @@ Használhatja az űrlapot is: Gipsz Jakab &lt;[email protected]&gt;</translation>
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Elérhető munkafelületek</translation>
     </message>
   </context>
   <context>
@@ -4504,31 +4504,31 @@ Az 'Állapot' oszlop tájékoztatja a visszaállítás sikerességéről.</trans
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Emelkedés (y-tengely körül):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Görgetés (x-tengely körül):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Forgatás (z-tengely körül):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Forgatás (z-tengely körül)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Emelkedés (y-tengely körül)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Görgetés (az x-tengely körül)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Euler-szögek (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -6056,7 +6056,7 @@ Meg szeretne adni egy másik könyvtárat?</translation>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bolgár</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6064,7 +6064,7 @@ Meg szeretne adni egy másik könyvtárat?</translation>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Spanyol, Argentína</translation>
     </message>
   </context>
   <context>
@@ -7031,7 +7031,7 @@ Fizikai útvonal: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Nem lehet menteni a dokumentumot</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7039,27 +7039,27 @@ Fizikai útvonal: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Volt egy probléma a fájl mentésekor. Ennek az lehet az oka, hogy a szülőmappák némelyike nem létezik, vagy nem rendelkezik elegendő engedéllyel, vagy más okból. Hiba részletei:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Szeretné menteni a fájlt egy másik névvel?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Dokumentum nincs mentve</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>A dokumentum%1 nem menthető. Nem szeretné bezárni?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 Dokumentum(ok) nincsen(ek) mentve</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Egyes dokumentumok nem menthetők. Nem szeretné bezárni?</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_it.ts

@@ -3308,7 +3308,7 @@ Si può anche utilizzare il modulo: John Doe &lt;[email protected]&gt;</translation>
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Ambienti di Lavoro Disponibili</translation>
     </message>
   </context>
   <context>
@@ -4507,31 +4507,31 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Beccheggio (intorno all'asse y):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Rollìo (intorno all'asse x):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Imbardata (intorno all'asse z):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Imbardata (intorno all'asse z)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Beccheggio (intorno all'asse y)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Rollìo (intorno all'asse x)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Angoli di Eulero (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -6058,7 +6058,7 @@ Vuoi specificare un'altra cartella?</translation>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bulgaro</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6066,7 +6066,7 @@ Vuoi specificare un'altra cartella?</translation>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Spagnolo (Argentina)</translation>
     </message>
   </context>
   <context>
@@ -7034,7 +7034,7 @@ Percorso fisico: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Impossibile salvare il documento</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7042,27 +7042,27 @@ Percorso fisico: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Si è verificato un problema cercando di salvare il file. Questo può essere dovuto al fatto che alcune delle cartelle genitore non esistono, o non si dispone di autorizzazioni sufficienti, o per altri motivi. Dettagli errore:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Vuoi salvare il file con un nome diverso?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Documento non salvato</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Il documento %1 non può essere salvato. Vuoi annullare la chiusura?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 Documento(i) non salvato</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Alcuni documenti non possono essere salvati. Vuoi annullare la chiusura?</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_nl.ts

@@ -524,7 +524,7 @@ while doing a left or right click and move the mouse up or down</source>
     </message>
     <message>
       <source>FreeCAD would not be possible without the contributions of</source>
-      <translation type="unfinished">FreeCAD would not be possible without the contributions of</translation>
+      <translation>FreeCAD zou niet mogelijk zijn met het werk van</translation>
     </message>
     <message>
       <source>Individuals</source>
@@ -1441,7 +1441,7 @@ Als dit niet is aangevinkt, dan moet de eigenschap uniek worden benoemd en is ka
     </message>
     <message>
       <source>Code lines will be numbered</source>
-      <translation type="unfinished">Code lines will be numbered</translation>
+      <translation>Code-regels worden genummerd</translation>
     </message>
   </context>
   <context>
@@ -2662,15 +2662,15 @@ Het wijzigen van deze optie vereist een herstart van de toepassing.</translation
     </message>
     <message>
       <source>What kind of multisample anti-aliasing is used</source>
-      <translation type="unfinished">What kind of multisample anti-aliasing is used</translation>
+      <translation>Wat voor soort multisample anti-aliasing wordt gebruikt</translation>
     </message>
     <message>
       <source>Eye-to-eye distance used for stereo projections.
 The specified value is a factor that will be multiplied with the
 bounding box size of the 3D object that is currently displayed.</source>
-      <translation type="unfinished">Eye-to-eye distance used for stereo projections.
-The specified value is a factor that will be multiplied with the
-bounding box size of the 3D object that is currently displayed.</translation>
+      <translation>Oog-naar-oog afstand wordt gebruikt voor stereo projecties.
+De opgegeven waarde is een factor die zal worden vermenigvuldigd met
+de begrenzingsvakgrootte van het 3D-object dat op dat moment wordt weergegeven.</translation>
     </message>
   </context>
   <context>
@@ -3290,23 +3290,23 @@ U kunt ook het formulier gebruiken: John Doe &lt;[email protected]&gt;</translation>
     <name>Gui::Dialog::DlgSettingsLazyLoaded</name>
     <message>
       <source>Workbench Name</source>
-      <translation type="unfinished">Workbench Name</translation>
+      <translation>Werkbank Naam</translation>
     </message>
     <message>
       <source>Autoload?</source>
-      <translation type="unfinished">Autoload?</translation>
+      <translation>Automatisch laden?</translation>
     </message>
     <message>
       <source>Load Now</source>
-      <translation type="unfinished">Load Now</translation>
+      <translation>Laad nu</translation>
     </message>
     <message>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om hulpbronnen te behouden, laadt FreeCAD geen werkbanken totdat ze worden gebruikt. Het laden ervan kan toegang bieden tot extra voorkeuren met betrekking tot hun functionaliteit.&lt;/p&gt;&lt;p&gt;De volgende werkbanken zijn beschikbaar in uw installatie:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Beschikbare werkbanken</translation>
     </message>
   </context>
   <context>
@@ -3317,27 +3317,27 @@ U kunt ook het formulier gebruiken: John Doe &lt;[email protected]&gt;</translation>
     </message>
     <message>
       <source>Autoload</source>
-      <translation type="unfinished">Autoload</translation>
+      <translation>Automatisch laden</translation>
     </message>
     <message>
       <source>If checked</source>
-      <translation type="unfinished">If checked</translation>
+      <translation>Indien aangevinkt</translation>
     </message>
     <message>
       <source>will be loaded automatically when FreeCAD starts up</source>
-      <translation type="unfinished">will be loaded automatically when FreeCAD starts up</translation>
+      <translation>wordt automatisch geladen wanneer FreeCAD opstart</translation>
     </message>
     <message>
       <source>This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.</source>
-      <translation type="unfinished">This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.</translation>
+      <translation>Dit is de huidige opstartmodule, en moet automatisch geladen worden. Zie Voorkeuren/General/Autoload om te wijzigen.</translation>
     </message>
     <message>
       <source>Loaded</source>
-      <translation type="unfinished">Loaded</translation>
+      <translation>Geladen</translation>
     </message>
     <message>
       <source>Load now</source>
-      <translation type="unfinished">Load now</translation>
+      <translation>Laad nu</translation>
     </message>
   </context>
   <context>
@@ -3643,7 +3643,7 @@ De kanteling van de muis wordt niet uitgeschakeld door deze instelling.</transla
     </message>
     <message>
       <source>Rotates to nearest possible state when clicking a cube face</source>
-      <translation type="unfinished">Rotates to nearest possible state when clicking a cube face</translation>
+      <translation>Draait naar dichtstbijzijnde mogelijke status bij het klikken op een kubus</translation>
     </message>
     <message>
       <source>Rotate to nearest</source>
@@ -3651,17 +3651,17 @@ De kanteling van de muis wordt niet uitgeschakeld door deze instelling.</transla
     </message>
     <message>
       <source>Cube size</source>
-      <translation type="unfinished">Cube size</translation>
+      <translation>Kubus grootte</translation>
     </message>
     <message>
       <source>Size of the navigation cube</source>
-      <translation type="unfinished">Size of the navigation cube</translation>
+      <translation>Grootte van de navigatie kubus</translation>
     </message>
     <message>
       <source>How much will be zoomed.
 Zoom step of '1' means a factor of 7.5 for every zoom step.</source>
-      <translation type="unfinished">How much will be zoomed.
-Zoom step of '1' means a factor of 7.5 for every zoom step.</translation>
+      <translation>Hoeveel zal er worden ingezoomd.
+Zoomstap van '1' betekent een factor 7,5 voor elke zoomstap.</translation>
     </message>
   </context>
   <context>
@@ -4505,31 +4505,31 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Pitch (rond y-as):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Rol (rond x-as):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Rol (rond z-as):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Rol (rond z-as)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Pitch (rond y-as)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Rol (rond x-as)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Euler hoeken (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -4694,13 +4694,13 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>&amp;Use Original Selections</source>
-      <translation type="unfinished">&amp;Use Original Selections</translation>
+      <translation>&amp;Originele selecties gebruiken</translation>
     </message>
     <message>
       <source>Ignore dependencies and proceed with objects
 originally selected prior to opening this dialog</source>
-      <translation type="unfinished">Ignore dependencies and proceed with objects
-originally selected prior to opening this dialog</translation>
+      <translation>Afhankelijkheden negeren en doorgaan met objecten
+oorspronkelijk geselecteerd voorafgaand aan het openen van dit dialoogvenster</translation>
     </message>
   </context>
   <context>
@@ -6051,7 +6051,7 @@ Wilt u een andere map opgeven?</translation>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bulgaars</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6059,7 +6059,7 @@ Wilt u een andere map opgeven?</translation>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Spaans, Argentinië</translation>
     </message>
   </context>
   <context>
@@ -7025,7 +7025,7 @@ Fysiek pad: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Kan verzending niet opslaan</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7033,27 +7033,27 @@ Fysiek pad: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Er is een probleem opgetreden bij het opslaan van het bestand. Dit kan komen doordat sommige van de bovenliggende mappen niet bestaan, of omdat je niet voldoende rechten hebt, of om andere redenen. Foutdetails:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Wilt u het bestand met een andere naam opslaan?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Document niet opgeslagen</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Het document%1 kon niet worden opgeslagen. Wilt u het sluiten annuleren?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 Document(en) niet opgeslagen</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Sommige documenten konden niet worden opgeslagen. Wilt u het sluiten annuleren?</translation>
     </message>
   </context>
   <context>
@@ -8831,11 +8831,11 @@ Would you like to save the file with a different name?</translation>
     <name>StdCmdUserEditMode</name>
     <message>
       <source>Edit mode</source>
-      <translation type="unfinished">Edit mode</translation>
+      <translation>Bewerk modus</translation>
     </message>
     <message>
       <source>Defines behavior when editing an object from tree</source>
-      <translation type="unfinished">Defines behavior when editing an object from tree</translation>
+      <translation>Definieert gedrag bij het bewerken van een object vanaf de boom</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_pl.ts

@@ -223,7 +223,7 @@
     </message>
     <message>
       <source>Default</source>
-      <translation>Domyślne</translation>
+      <translation>Domyślny</translation>
     </message>
     <message>
       <source>Enable</source>
@@ -280,7 +280,7 @@
     <name>EditMode</name>
     <message>
       <source>Default</source>
-      <translation>Domyślne</translation>
+      <translation>Domyślny</translation>
     </message>
     <message>
       <source>Transform</source>
@@ -747,11 +747,11 @@ In this case the prefix will be automatically trimmed when shown in the property
 However, the property is still used in a script with the full name, like 'obj.Group_Name'.
 
 If this is not ticked, then the property must be uniquely named, and it is accessed like 'obj.Name'.</source>
-      <translation>Przedrostek nazwy własności z nazwą grupy w formie "Group_Name", aby uniknąć konfliktów z istniejącą własnością.
+      <translation>Przedrostek nazwy własności z nazwą grupy w formie "Group_Name", aby uniknąć konfliktów z istniejącą właściwością.
 W tym przypadku przedrostek zostanie automatycznie obcięty podczas wyświetlania w edytorze właściwości.
-Jednak własność jest nadal używana w skrypcie z pełną nazwą, na przykład 'obj.Group_Name'.
+Jednak właściwość jest nadal używana w skrypcie z pełną nazwą, na przykład "obj.Group_Name".
 
-Jeśli ta opcja nie jest zaznaczona, własność musi być jednoznacznie nazwana i jest dostępna jako 'obj.Name'.</translation>
+Jeśli ta opcja nie jest zaznaczona, właściwość musi być jednoznacznie nazwana i jest dostępna jako "obj.Name".</translation>
     </message>
     <message>
       <source>Prefix group name</source>
@@ -1263,7 +1263,7 @@ Jeśli ta opcja nie jest zaznaczona, własność musi być jednoznacznie nazwana
     <name>Gui::Dialog::DlgDisplayPropertiesImp</name>
     <message>
       <source>Default</source>
-      <translation>Domyślne</translation>
+      <translation>Domyślny</translation>
     </message>
     <message>
       <source>Aluminium</source>
@@ -2860,7 +2860,7 @@ rozmiar ramki otaczającej obiekt 3D, który jest aktualnie wyświetlany.</trans
     </message>
     <message>
       <source>Allow duplicate object labels in one document</source>
-      <translation>Zezwala na umieszczanie duplikatów etykiet obiektów w obrębie jednego dokumentu</translation>
+      <translation>Zezwalaj na umieszczanie duplikatów etykiet obiektów w obrębie jednego dokumentu</translation>
     </message>
     <message>
       <source>Maximum Undo/Redo steps</source>
@@ -3070,7 +3070,7 @@ Możesz również skorzystać z formatki: John Doe &lt;[email protected]&gt;</transla
     </message>
     <message>
       <source>Default</source>
-      <translation>Domyślne</translation>
+      <translation>Domyślny</translation>
     </message>
     <message>
       <source>Format</source>
@@ -3306,7 +3306,7 @@ Możesz również skorzystać z formatki: John Doe &lt;[email protected]&gt;</transla
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Dostępne środowiska pracy</translation>
     </message>
   </context>
   <context>
@@ -4508,31 +4508,31 @@ Kolumna "Aktualny status" pokazuje, czy dokument może być odzyskany.</translat
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Skok (względem osi y):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Obrót (wokół osi x):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Odchylenie (względem osi z):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Odchylenie (względem osi z)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Skok (względem osi y)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Obrót (wokół osi x)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Kąty Eulera (zy'x')</translation>
     </message>
   </context>
   <context>
@@ -6054,7 +6054,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bułgarski</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6062,7 +6062,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Hiszpański, Argentyna</translation>
     </message>
   </context>
   <context>
@@ -7027,7 +7027,7 @@ Physical path: </source>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Nie udało się zapisać dokumentu</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7035,27 +7035,27 @@ Physical path: </source>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Wystąpił błąd podczas próby zapisania pliku. Może tak być dlatego, że niektóre foldery nadrzędne nie istnieją, nie masz wystarczających uprawnień lub z innych powodów. Szczegóły błędu:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Czy chcesz zapisać plik pod inną nazwą?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Dokument nie zapisany</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Nie można zapisać dokumentu %1. Czy chcesz przerwać zamykanie dokumentu?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>Dokument %1 nie został zapisany</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Niektóre dokumenty nie mogły zostać zapisane. Czy chcesz przerwać zamykanie dokumentów?</translation>
     </message>
   </context>
   <context>
@@ -8968,7 +8968,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Fit selection</source>
-      <translation>Dopasuj wybór</translation>
+      <translation>Dopasuj do wyboru</translation>
     </message>
     <message>
       <source>Fits the selected content on the screen</source>
@@ -9092,7 +9092,7 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Switch stereo viewing to quad buffer</source>
-      <translation>Przełączanie wyświetlania podglądu stereoskopowego na bufor poczwórny</translation>
+      <translation>Przełącz widok stereo na bufor poczwórny</translation>
     </message>
   </context>
   <context>
@@ -9695,7 +9695,7 @@ Czy na pewno kontynuować?
     </message>
     <message>
       <source>Hidden line mode</source>
-      <translation>Tryb ukrytej linii</translation>
+      <translation>Tryb cieniowany z ukrytymi krawędziami</translation>
     </message>
     <message>
       <source>No shading</source>
@@ -9899,7 +9899,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
       <source>Default</source>
-      <translation>Domyślne</translation>
+      <translation>Domyślny</translation>
     </message>
     <message>
       <source>Windows XP</source>

src/Gui/Language/FreeCAD_pt-BR.ts

@@ -3294,11 +3294,11 @@ Você também pode usar o formulário: João Silva &lt;[email protected]&gt;</trans
     </message>
     <message>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Para preservar os recursos, o FreeCAD não carrega bancadas até que sejam usadas. Carregá-las pode fornecer acesso a preferências adicionais relacionadas à sua funcionalidade.&lt;/p&gt;&lt;p&gt;As seguintes bancadas estão disponíveis em sua instalação:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Bancadas de trabalho disponíveis</translation>
     </message>
   </context>
   <context>
@@ -3321,7 +3321,7 @@ Você também pode usar o formulário: João Silva &lt;[email protected]&gt;</trans
     </message>
     <message>
       <source>This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.</source>
-      <translation type="unfinished">This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.</translation>
+      <translation>Este é o módulo de inicialização atual e ele deve ser carregado automaticamente. Veja preferências/Gerais/Carregamento automático para mudar.</translation>
     </message>
     <message>
       <source>Loaded</source>
@@ -4497,31 +4497,31 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Passo do dente (em torno do eixo-Y):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Rolagem (em torno do eixo-x):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Guinada (em torno do eixo-z):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Guinada (em torno do eixo-z)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Passo do dente (em torno do eixo-Y)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Rolagem (em torno do eixo-x)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Ângulos de Euler (zy'x)</translation>
     </message>
   </context>
   <context>
@@ -4686,13 +4686,13 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>&amp;Use Original Selections</source>
-      <translation type="unfinished">&amp;Use Original Selections</translation>
+      <translation>&amp;Usar seleções originais</translation>
     </message>
     <message>
       <source>Ignore dependencies and proceed with objects
 originally selected prior to opening this dialog</source>
-      <translation type="unfinished">Ignore dependencies and proceed with objects
-originally selected prior to opening this dialog</translation>
+      <translation>Ignorar dependências e prosseguir com objetos
+originalmente selecionados antes de abrir esta caixa de diálogo</translation>
     </message>
   </context>
   <context>
@@ -6043,7 +6043,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Búlgaro</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6051,7 +6051,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Espanhol, Argentina</translation>
     </message>
   </context>
   <context>
@@ -7013,7 +7013,7 @@ Caminho físico: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Não foi possível salvar o documento</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7021,27 +7021,27 @@ Caminho físico: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Houve um problema ao tentar salvar o arquivo. Isso pode ser devido ao fato de algumas das pastas de origem não existirem ou não possui as permissões necessárias ou por outras razões. Detalhes do erro:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Salvar o arquivo com um nome diferente?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Documento não salvo</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>O documento%1 não pode ser salvo. Cancelar o fechamento?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 Documento(s) não foram salvos</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Alguns documentos não puderam ser salvos. Cancelar o fechamento?</translation>
     </message>
   </context>
   <context>
@@ -8819,11 +8819,11 @@ Would you like to save the file with a different name?</translation>
     <name>StdCmdUserEditMode</name>
     <message>
       <source>Edit mode</source>
-      <translation type="unfinished">Edit mode</translation>
+      <translation>Modo de edição</translation>
     </message>
     <message>
       <source>Defines behavior when editing an object from tree</source>
-      <translation type="unfinished">Defines behavior when editing an object from tree</translation>
+      <translation>Define o comportamento ao editar um objeto da arborescência</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_ru.ts

@@ -3307,7 +3307,7 @@ Opening mode: If you defined a hinge in this component or any other earlier in t
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Доступные верстаки</translation>
     </message>
   </context>
   <context>
@@ -4509,31 +4509,31 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Тангаж (вокруг y-оси):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Крен (вокруг y-оси):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Рыскание (вокруг z-оси):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Рыскание (вокруг z-оси)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Тангаж (вокруг y-оси)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Крен (вокруг x-оси)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Углы Эйлера (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -6057,7 +6057,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Болгарский</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6065,7 +6065,7 @@ Do you want to specify another directory?</source>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Испанский, Аргенитна</translation>
     </message>
   </context>
   <context>
@@ -7029,7 +7029,7 @@ Physical path: </source>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Невозможно сохранить документ</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7045,15 +7045,15 @@ Would you like to save the file with a different name?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Документ не сохранен</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Документ %1 не может быть сохранен. Вы хотите отменить его закрытие?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 Документ(ы) не сохранены</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
@@ -8835,7 +8835,7 @@ Would you like to save the file with a different name?</translation>
     <name>StdCmdUserEditMode</name>
     <message>
       <source>Edit mode</source>
-      <translation type="unfinished">Edit mode</translation>
+      <translation>Режим редактирования</translation>
     </message>
     <message>
       <source>Defines behavior when editing an object from tree</source>

src/Gui/Language/FreeCAD_sl.ts

@@ -2291,11 +2291,11 @@ Navedite drugo mapo.</translation>
     </message>
     <message>
       <source>Redirect internal Python errors to report view</source>
-      <translation>Preusmeri notranje napake Pythona na poročilni pogled</translation>
+      <translation>Preusmeri notranje napake Pythona na poročevalni pogled</translation>
     </message>
     <message>
       <source>Redirect internal Python output to report view</source>
-      <translation>Preusmeri notranji izpis Pythona na poročilni pogled</translation>
+      <translation>Preusmeri notranji izpis Pythona na poročevalni pogled</translation>
     </message>
     <message>
       <source>Python interpreter</source>
@@ -3310,7 +3310,7 @@ Lahko uporabite tudi obliko: Neznanec &lt;[email protected]&gt;</translation>
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Razpoložljiva delovna okolja</translation>
     </message>
   </context>
   <context>
@@ -4509,31 +4509,31 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Naklon (okoli osi y):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Nagib (okoli osi x):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
-      <translation type="unfinished">Yaw (around z-axis):</translation>
+      <translation>Odklon (okoli osi z):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis)</source>
-      <translation type="unfinished">Yaw (around z-axis)</translation>
+      <translation>Odklon (okoli osi z)</translation>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Naklon (okoli osi y)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Nagib (okoli osi x)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Eulerjevi koti (zy'x")</translation>
     </message>
   </context>
   <context>
@@ -6061,7 +6061,7 @@ Ali želite navesti drugo mapo?</translation>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>bolgarščina</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6069,7 +6069,7 @@ Ali želite navesti drugo mapo?</translation>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>španščina, Argentina</translation>
     </message>
   </context>
   <context>
@@ -6406,7 +6406,7 @@ Ali želite navesti drugo mapo?</translation>
     </message>
     <message>
       <source>Report view</source>
-      <translation>Pogled poročil</translation>
+      <translation>Poročevalni pogled</translation>
     </message>
     <message>
       <source>Combo View</source>
@@ -6855,7 +6855,7 @@ Upoštevajte, da je mesto klika pomembno.</translation>
       <source>Failed to parse some of the expressions.
 Please check the Report View for more details.</source>
       <translation>Nekaterh izrazov ni bilo mogoče razčleniti.
-Za več podrobnosti poglejte Poročilni pogled.</translation>
+Za več podrobnosti poglejte Poročevalni pogled.</translation>
     </message>
     <message>
       <source>Failed to paste expressions</source>
@@ -6993,7 +6993,7 @@ Izberite "Prekini" za prekinitev</translation>
 Please check report view for more...</source>
       <translation>
 
-Za več informacij poglejte poročilni pogled ...</translation>
+Za več informacij poglejte poročevalni pogled ...</translation>
     </message>
     <message>
       <source>
@@ -7037,7 +7037,7 @@ Tvarna pot: </translation>
     </message>
     <message>
       <source>Could not save document</source>
-      <translation type="unfinished">Could not save document</translation>
+      <translation>Dokumenta ni bilo mogoče shraniti</translation>
     </message>
     <message>
       <source>There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
@@ -7045,27 +7045,27 @@ Tvarna pot: </translation>
 "%1"
 
 Would you like to save the file with a different name?</source>
-      <translation type="unfinished">There was an issue trying to save the file. This may be because some of the parent folders do not exist, or you do not have sufficient permissions, or for other reasons. Error details:
+      <translation>Pri shranjevanju te datoteke je prišlo do težave. Razlog za to je lahko, da določene nadrejene mape ne obstajajo, nimate zadostnih dovoljenj ali pa drugi razlogi. Podrobnosti o napaki:
 
 "%1"
 
-Would you like to save the file with a different name?</translation>
+Ali želite datoteko shraniti z drugačnim imenom?</translation>
     </message>
     <message>
       <source>Document not saved</source>
-      <translation type="unfinished">Document not saved</translation>
+      <translation>Dokument ni shranjen</translation>
     </message>
     <message>
       <source>The document%1 could not be saved. Do you want to cancel closing it?</source>
-      <translation type="unfinished">The document%1 could not be saved. Do you want to cancel closing it?</translation>
+      <translation>Dokumenta%1 ni bilo mogoče shraniti. Ali želite preklicati zapiranje?</translation>
     </message>
     <message>
       <source>%1 Document(s) not saved</source>
-      <translation type="unfinished">%1 Document(s) not saved</translation>
+      <translation>%1 Dokumenti niso shranjeni</translation>
     </message>
     <message>
       <source>Some documents could not be saved. Do you want to cancel closing?</source>
-      <translation type="unfinished">Some documents could not be saved. Do you want to cancel closing?</translation>
+      <translation>Določenih dokumentov se ni dalo zapreti. Ali želite preklicati zapiranje?</translation>
     </message>
   </context>
   <context>

src/Gui/Language/FreeCAD_sv-SE.ts

@@ -524,12 +524,12 @@ while doing a left or right click and move the mouse up or down</source>
     </message>
     <message>
       <source>FreeCAD would not be possible without the contributions of</source>
-      <translation type="unfinished">FreeCAD would not be possible without the contributions of</translation>
+      <translation>FreeCAD skulle inte vara möjligt utan bidrag från</translation>
     </message>
     <message>
       <source>Individuals</source>
       <extracomment>Header for the list of individual people in the Credits list.</extracomment>
-      <translation type="unfinished">Individuals</translation>
+      <translation>Personer</translation>
     </message>
     <message>
       <source>Organizations</source>
@@ -1441,7 +1441,7 @@ Om detta inte väljs måste egenskapen vara unikt namngiven och den nås som 'ob
     </message>
     <message>
       <source>Code lines will be numbered</source>
-      <translation type="unfinished">Code lines will be numbered</translation>
+      <translation>Kodrader kommer att numreras</translation>
     </message>
   </context>
   <context>
@@ -2665,15 +2665,15 @@ För att ändra detta alternativ krävs en omstart av programmet.</translation>
     </message>
     <message>
       <source>What kind of multisample anti-aliasing is used</source>
-      <translation type="unfinished">What kind of multisample anti-aliasing is used</translation>
+      <translation>Vilken typ av multisamplad anti-aliasing används</translation>
     </message>
     <message>
       <source>Eye-to-eye distance used for stereo projections.
 The specified value is a factor that will be multiplied with the
 bounding box size of the 3D object that is currently displayed.</source>
-      <translation type="unfinished">Eye-to-eye distance used for stereo projections.
-The specified value is a factor that will be multiplied with the
-bounding box size of the 3D object that is currently displayed.</translation>
+      <translation>Öga-till-öga avstånd används för stereoprojektioner.
+Det angivna värdet är en faktor som kommer att multipliceras med
+storleken på det 3D-objekt som visas.</translation>
     </message>
   </context>
   <context>
@@ -3275,42 +3275,42 @@ Du kan också använda formuläret: John Doe &lt;[email protected]&gt;</translation>
     <name>Gui::Dialog::DlgSettingsImageImp</name>
     <message>
       <source>Offscreen (New)</source>
-      <translation type="unfinished">Offscreen (New)</translation>
+      <translation>Offscreen (Ny)</translation>
     </message>
     <message>
       <source>Offscreen (Old)</source>
-      <translation type="unfinished">Offscreen (Old)</translation>
+      <translation>Offscreen (gammal)</translation>
     </message>
     <message>
       <source>Framebuffer (custom)</source>
-      <translation type="unfinished">Framebuffer (custom)</translation>
+      <translation>Framebuffer (anpassad)</translation>
     </message>
     <message>
       <source>Framebuffer (as is)</source>
-      <translation type="unfinished">Framebuffer (as is)</translation>
+      <translation>Framebuffer (som är)</translation>
     </message>
   </context>
   <context>
     <name>Gui::Dialog::DlgSettingsLazyLoaded</name>
     <message>
       <source>Workbench Name</source>
-      <translation type="unfinished">Workbench Name</translation>
+      <translation>Namn på arbetsbänk</translation>
     </message>
     <message>
       <source>Autoload?</source>
-      <translation type="unfinished">Autoload?</translation>
+      <translation>Auto-laddad?</translation>
     </message>
     <message>
       <source>Load Now</source>
-      <translation type="unfinished">Load Now</translation>
+      <translation>Ladda nu</translation>
     </message>
     <message>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;För att bevara resurser laddar FreeCAD inte arbetsbänkar förrän de används. Laddar dem kan ge tillgång till ytterligare inställningar relaterade till deras funktionalitet.&lt;/p&gt;&lt;p&gt;Följande arbetsbänkar finns tillgängliga i din installation, men är ännu inte laddade:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
       <source>Available Workbenches</source>
-      <translation type="unfinished">Available Workbenches</translation>
+      <translation>Tillgängliga arbetsbänkar</translation>
     </message>
   </context>
   <context>
@@ -3321,27 +3321,27 @@ Du kan också använda formuläret: John Doe &lt;[email protected]&gt;</translation>
     </message>
     <message>
       <source>Autoload</source>
-      <translation type="unfinished">Autoload</translation>
+      <translation>Autoladda</translation>
     </message>
     <message>
       <source>If checked</source>
-      <translation type="unfinished">If checked</translation>
+      <translation>Om kontrollerad</translation>
     </message>
     <message>
       <source>will be loaded automatically when FreeCAD starts up</source>
-      <translation type="unfinished">will be loaded automatically when FreeCAD starts up</translation>
+      <translation>laddas automatiskt när FreeCAD startas upp</translation>
     </message>
     <message>
       <source>This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.</source>
-      <translation type="unfinished">This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change.</translation>
+      <translation>Detta är den aktuella startmodulen och måste autoladdas. Se Inställningar/Allmän/Autoladda för att ändra.</translation>
     </message>
     <message>
       <source>Loaded</source>
-      <translation type="unfinished">Loaded</translation>
+      <translation>Laddad</translation>
     </message>
     <message>
       <source>Load now</source>
-      <translation type="unfinished">Load now</translation>
+      <translation>Ladda nu</translation>
     </message>
   </context>
   <context>
@@ -3645,25 +3645,25 @@ Mouse tilting is not disabled by this setting.</source>
     </message>
     <message>
       <source>Rotates to nearest possible state when clicking a cube face</source>
-      <translation type="unfinished">Rotates to nearest possible state when clicking a cube face</translation>
+      <translation>Roterar till närmaste möjliga tillstånd när du klickar på en kubsida</translation>
     </message>
     <message>
       <source>Rotate to nearest</source>
-      <translation type="unfinished">Rotate to nearest</translation>
+      <translation>Rotera till närmaste</translation>
     </message>
     <message>
       <source>Cube size</source>
-      <translation type="unfinished">Cube size</translation>
+      <translation>Kubstorlek</translation>
     </message>
     <message>
       <source>Size of the navigation cube</source>
-      <translation type="unfinished">Size of the navigation cube</translation>
+      <translation>Storlek på navigationskuben</translation>
     </message>
     <message>
       <source>How much will be zoomed.
 Zoom step of '1' means a factor of 7.5 for every zoom step.</source>
-      <translation type="unfinished">How much will be zoomed.
-Zoom step of '1' means a factor of 7.5 for every zoom step.</translation>
+      <translation>Hur mycket kommer att zoomas.
+Zoomsteg '1' betyder en faktor på 7,5 för varje zoomsteg.</translation>
     </message>
   </context>
   <context>
@@ -4507,11 +4507,11 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis):</source>
-      <translation type="unfinished">Pitch (around y-axis):</translation>
+      <translation>Pitch (runt y-axeln):</translation>
     </message>
     <message>
       <source>Roll (around x-axis):</source>
-      <translation type="unfinished">Roll (around x-axis):</translation>
+      <translation>Rulla (runt x-axeln):</translation>
     </message>
     <message>
       <source>Yaw (around z-axis):</source>
@@ -4523,15 +4523,15 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>Pitch (around y-axis)</source>
-      <translation type="unfinished">Pitch (around y-axis)</translation>
+      <translation>Pitch (runt y-axeln)</translation>
     </message>
     <message>
       <source>Roll (around the x-axis)</source>
-      <translation type="unfinished">Roll (around the x-axis)</translation>
+      <translation>Rulla (runt x-axeln)</translation>
     </message>
     <message>
       <source>Euler angles (zy'x'')</source>
-      <translation type="unfinished">Euler angles (zy'x'')</translation>
+      <translation>Euler vinklar (zy'x'')</translation>
     </message>
   </context>
   <context>
@@ -4696,13 +4696,13 @@ The 'Status' column shows whether the document could be recovered.</source>
     </message>
     <message>
       <source>&amp;Use Original Selections</source>
-      <translation type="unfinished">&amp;Use Original Selections</translation>
+      <translation>&amp;Använd ursprungliga val</translation>
     </message>
     <message>
       <source>Ignore dependencies and proceed with objects
 originally selected prior to opening this dialog</source>
-      <translation type="unfinished">Ignore dependencies and proceed with objects
-originally selected prior to opening this dialog</translation>
+      <translation>Ignorera beroenden och fortsätt med objekt
+som ursprungligen valts innan du öppnar denna dialogruta</translation>
     </message>
   </context>
   <context>
@@ -5778,7 +5778,7 @@ Vill du ange en annan katalog?</translation>
     </message>
     <message>
       <source>Recompute after commit</source>
-      <translation type="unfinished">Recompute after commit</translation>
+      <translation>Omräkna efter ändring</translation>
     </message>
     <message>
       <source>Remove</source>
@@ -6059,7 +6059,7 @@ Vill du ange en annan katalog?</translation>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bulgariska</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6067,7 +6067,7 @@ Vill du ange en annan katalog?</translation>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>Spanska, Argentina</translation>
     </message>
   </context>
   <context>
@@ -6857,7 +6857,7 @@ Vänligen kontrollera rapportvyn för mer information.</translation>
     </message>
     <message>
       <source>Failed to paste expressions</source>
-      <translation type="unfinished">Failed to paste expressions</translation>
+      <translation>Misslyckas att klistra in uttryck</translation>
     </message>
     <message>
       <source>Simple group</source>

src/Gui/Language/FreeCAD_tr.ts

@@ -6054,7 +6054,7 @@ Başka bir dizin belirlemek ister misiniz?</translation>
     </message>
     <message>
       <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <translation>Bulgarca</translation>
     </message>
     <message>
       <source>Greek</source>
@@ -6062,7 +6062,7 @@ Başka bir dizin belirlemek ister misiniz?</translation>
     </message>
     <message>
       <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <translation>İspanyolca, Arjantin</translation>
     </message>
   </context>
   <context>

src/Gui/Qt4All.h

@@ -108,6 +108,7 @@
 #include <QPixmapCache>
 #include <QPlainTextEdit>
 #include <QPrinter>
+#include <QPrinterInfo>
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
 #include <QPrintPreviewWidget>

src/Gui/resource.cpp

@@ -50,6 +50,7 @@
 #include "DlgKeyboardImp.h"
 #include "DlgCustomizeSpaceball.h"
 #include "DlgCustomizeSpNavSettings.h"
+#include "DlgSettingsCacheDirectory.h"
 #include "InputField.h"
 #include "QuantitySpinBox.h"
 #include "PrefWidgets.h"
@@ -69,6 +70,7 @@ WidgetFactorySupplier::WidgetFactorySupplier()
   //new PrefPageProducer<DlgOnlineHelpImp>         ( QT_TRANSLATE_NOOP("QObject","General") );
     new PrefPageProducer<DlgSettingsDocumentImp>   ( QT_TRANSLATE_NOOP("QObject","General") );
     new PrefPageProducer<DlgSettingsSelection>     ( QT_TRANSLATE_NOOP("QObject","General") );
+    new PrefPageProducer<DlgSettingsCacheDirectory>( QT_TRANSLATE_NOOP("QObject","General") );
     new PrefPageProducer<DlgSettingsEditorImp>     ( QT_TRANSLATE_NOOP("QObject","General") );
     new PrefPageProducer<DlgReportViewImp>         ( QT_TRANSLATE_NOOP("QObject","General") );
     new PrefPageProducer<DlgSettingsMacroImp>      ( QT_TRANSLATE_NOOP("QObject","General") );

src/Mod/AddonManager/Resources/translations/AddonManager.ts

@@ -196,11 +196,26 @@
         <source>Addon manager</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="AddonManager.py" line="203"/>
+        <source>You must restart FreeCAD for changes to take effect.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="AddonManager.py" line="204"/>
         <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="AddonManager.py" line="209"/>
+        <source>Restart now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="AddonManager.py" line="210"/>
+        <source>Restart later</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="AddonManager.py" line="243"/>
         <source>Checking for updates...</source>

src/Mod/AddonManager/Resources/translations/AddonManager_ca.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="ca" sourcelanguage="en">
+<TS version="2.1" language="ca" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>No es pot obtindre el codi d'aquesta macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>No es pot descarregar la llista d'extensions.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>No es pot recuperar una descripció d'aquesta macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Banc de treball actualitzat.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>S'ha detectat GitPython obsolet, plantegeu-vos l'actualització amb pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>La llista de macos s'ha recuperat correctament.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>No s'ha instal·lat GitPython! No es poden recuperar les macros de git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>S'ha produït un error amb la recuperació de macros de Git, possiblement l'executable de Git no estigui en la ruta</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Sembla que és hi ha algun problema de connexió amb el Wiki, per tant no es pot recuperar la llista de macros de la Wiki en aquest moment</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>S'està recuperant la descripció...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>S'està recuperant informació de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Mostrant Markdown sense processar</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Falta la biblioteca Python Markdown.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Hi ha una actualització disponible per a aquest complement.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Aquest complement ja s'ha instal·lat.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Aquest complement està marcat com a obsolet</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Normalment significa que ja no és mantingut i que algun complement més avançat d'aquesta llista ofereix la mateixa funcionalitat.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Aquest complement està marcat només com a Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>És possible que aquest banc de treball ja no es mantingui i instal·lar-lo en un sistema Python 3 provocarà probablement errors en iniciar-se o en ús.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>S'està recuperant informació de git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>S'està recuperant informació del wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Aquesta macro ja s'ha instal·lat.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>No s'ha trobat GitPython. En lloc seu s'utilitza la descàrrega estàndard.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>La vostra versió de python n&apos;o sembla ser compatible amb els fitxers ZIP. No es pot procedir.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>L'usuari ha sol·licitat l'actualització d'un banc de treball Python 2 en un sistema que executa Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>El banc de treball s'ha instal·lat correctament. Reinicieu FreeCAD per aplicar els canvis.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>L'usuari ha sol·licitat l'actualització d'un banc de treball Python 2 en un sistema que executa Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>El banc de treball s'ha instal·lat correctament. Reinicieu FreeCAD per aplicar els canvis.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>S'ha instal·lat una macro i està disponible en el menú Macro -&gt; Macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Falta el banc de treball</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Manca el mòdul python</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Manca el mòdul python opcional (n&apos;o impedeix la instal·lació)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>S'han trobat alguns errors que impedeixen instal·lar aquest banc de treball</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Si us plau, instal·leu primer els components que manquen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>S'ha produït un error: no s'ha pogut localitzar el zip des de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>S'ha produït un error: no es pot baixar</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>S'ha instal·lat correctament</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Gestor d'extensions</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Cal que reinicis FreeCAD per què els canvis s'efectuin. Premi Acceptar per reinciciar-lo ara, o bé, Cancel·lar per fer-ho més tard.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>No hi ha actualizacions disponibles</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>S'ha instal·lat</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>No s'ha pogut eliminar la macro.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>No es pot descarregar la llista d'extensions.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Banc de treball actualitzat.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>S'ha detectat GitPython obsolet, plantegeu-vos l'actualització amb pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>La llista de macos s'ha recuperat correctament.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>S'està recuperant la descripció...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>S'està recuperant informació de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Hi ha una actualització disponible per a aquest complement.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Aquest complement ja s'ha instal·lat.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>S'està recuperant informació de git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>S'està recuperant informació del wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>No s'ha trobat GitPython. En lloc seu s'utilitza la descàrrega estàndard.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>La vostra versió de python n&apos;o sembla ser compatible amb els fitxers ZIP. No es pot procedir.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>El banc de treball s'ha instal·lat correctament. Reinicieu FreeCAD per aplicar els canvis.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Falta el banc de treball</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Manca el mòdul python</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Manca el mòdul python opcional (n&apos;o impedeix la instal·lació)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>S'han trobat alguns errors que impedeixen instal·lar aquest banc de treball</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Si us plau, instal·leu primer els components que manquen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>S'ha produït un error: no es pot baixar</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>S'ha instal·lat correctament</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>No s'ha instal·lat GitPython! No es poden recuperar les macros de git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>S'ha instal·lat</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,205 +282,14 @@
       <translation>S'ha de reiniciar</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Aquesta macro ja s'ha instal·lat.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>No es pot obtindre el codi d'aquesta macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>S'ha instal·lat una macro i està disponible en el menú Macro -&gt; Macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Aquest complement està marcat com a obsolet</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Normalment significa que ja no és mantingut i que algun complement més avançat d'aquesta llista ofereix la mateixa funcionalitat.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>S'ha produït un error: no s'ha pogut localitzar el zip des de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>S'ha produït un error amb la recuperació de macros de Git, possiblement l'executable de Git no estigui en la ruta</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Aquest complement està marcat només com a Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>És possible que aquest banc de treball ja no es mantingui i instal·lar-lo en un sistema Python 3 provocarà probablement errors en iniciar-se o en ús.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>L'usuari ha sol·licitat l'actualització d'un banc de treball Python 2 en un sistema que executa Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>El banc de treball s'ha instal·lat correctament. Reinicieu FreeCAD per aplicar els canvis.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>L'usuari ha sol·licitat l'actualització d'un banc de treball Python 2 en un sistema que executa Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Sembla que és hi ha algun problema de connexió amb el Wiki, per tant no es pot recuperar la llista de macros de la Wiki en aquest moment</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Mostrant Markdown sense processar</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Falta la biblioteca Python Markdown.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Bancs de treball</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macros</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Executa</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>S'està baixant la informació...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Actualitza-ho tot</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Executa la macro seleccionada, si està instal·lada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Desinstal·la la macro seleccionada o el banc de treball</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instal·la o actualitza la macro seleccionada o el banc de treball</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Baixa i aplica totes les actualitzacions disponibles</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repositoris personalitzats (un per línia):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Estableix les opcions de configuració per al gestor de complements</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configura...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opcions del gestor de complements</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Desinstal·la la selecció</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instal·la/actualitza la selecció</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Tanca</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Si aquesta opció està seleccionada, en llançar el gestor de complements, es comprovarà si hi ha actualitzacions disponibles per als components instal·lats (requereix que el paquet GitPython estiga instal·lat en el sistema)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Comprova automàticament si hi ha actualitzacions en iniciar (requereix GitPithon)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Servidor intermediari </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Sense servidor intermediari</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Servidor intermediari del sistema de l'usuari</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Servidor intermediari definit per l'usuari :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Gestor de complements</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Tanca el gestor de complements</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Podeu utilitzar aquesta finestra per a especificar repositoris de complements addicionals que s'hauran d'escanejar per als components disponibles</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>No es pot recuperar una descripció d'aquesta macro.</translation>
     </message>
   </context>
   <context>
@@ -421,4 +305,135 @@ to be scanned for available addons</source>
       <translation>Gestiona els bancs de treball i les macros externs</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Gestor de complements</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Bancs de treball</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macros</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Executa la macro seleccionada, si està instal·lada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Executa</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Estableix les opcions de configuració per al gestor de complements</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configura...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>S'està baixant la informació...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Desinstal·la la macro seleccionada o el banc de treball</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Desinstal·la la selecció</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instal·la o actualitza la macro seleccionada o el banc de treball</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instal·la/actualitza la selecció</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Baixa i aplica totes les actualitzacions disponibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Actualitza-ho tot</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Tanca el gestor de complements</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Tanca</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opcions del gestor de complements</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Si aquesta opció està seleccionada, en llançar el gestor de complements, es comprovarà si hi ha actualitzacions disponibles per als components instal·lats (requereix que el paquet GitPython estiga instal·lat en el sistema)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Comprova automàticament si hi ha actualitzacions en iniciar (requereix GitPithon)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repositoris personalitzats (un per línia):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Podeu utilitzar aquesta finestra per a especificar repositoris de complements addicionals que s'hauran d'escanejar per als components disponibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Servidor intermediari </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Sense servidor intermediari</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Servidor intermediari del sistema de l'usuari</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Servidor intermediari definit per l'usuari :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_cs.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="cs" sourcelanguage="en">
+<TS version="2.1" language="cs" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Nelze načíst kód tohoto makra.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Seznam doplňků nelze stáhnout.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Nelze načíst popis tohto makra.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Seznam pracovních prostředí byl aktualizován.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Zjištěn zastaralý GitPython, zvažte upgrade pomocí pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Seznam maker úspěšně načten.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython není nainstalován! Nelze načíst makra z gitu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Něco se pokazilo s Git Macro Retrieval, možná není spustitelný Git v cestě</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Zdá se, že je problém s připojením k Wiki, proto momentálně nelze získat seznam maker Wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Načítání popisu...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Načítání informací z</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Zobrazit čisté markdown</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Chybí python knihovna Markdown.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Pro tento doplněk je dostupná aktualizace.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Toto rozšíření je již nainstalováno.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Tento doplněk je označen jako zastaralý</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>To obvykle znamená, že již není udržován a některé pokročilejší doplňky v tomto seznamu poskytují stejnou funkčnost.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Tento doplněk je označen pouze jako Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Tento pracovní prostředí již nemusí být udržován a instalace do systému Python 3 bude mít pravděpodobně za následek chyby při startu nebo při používání.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Načítání informací z gitu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Načítání informací z wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Toto makro je již nainstalováno.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython nenalezen. Použijte standardní způsob stažení.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Vaše verze pythonu pravděpodobně nepodporuje ZIP soubory. Nelze pokračovat.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Uživatel požádal o aktualizaci pracovního prostředí Pythonu 2 do systému, který používá Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Pracovní prostředí bylo úspěšně aktualizováno. Pro aplikaci změn prosím restartujte FreeCAD.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Uživatel požádal o instalaci pracovního prostředí Pythonu 2 do systému, který používá Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Pracovní prostředí bylo úspěšně nainstalováno. Pro aplikaci změn prosím restartujte FreeCAD.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Makro bylo nainstalováno a je k dispozici v menu Makro -&gt; Makra</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Chybí pracovní prostředí</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Chybějící modul python</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Chybí volitelný modul pythonu (nebrání instalaci)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Byly nalezeny chyby, které brání instalaci tohoto pracovního prostředí</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Nejprve prosím nainstalujte chybějící komponenty.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Chyba: Nelze najít zip z</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Chyba: Nelze stáhnout</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Úspěšně nainstalováno</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Správce rozšíření</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Aby se změny projevily, musíte FreeCAD restartovat. Stiskněte Ok pro restartování FreeCADu, nebo Zrušit pro pozdější restart.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Nejsou k dispozici žádné aktualizace</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Nainstalováno</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Makro nelze odstranit.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Seznam doplňků nelze stáhnout.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Seznam pracovních prostředí byl aktualizován.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Zjištěn zastaralý GitPython, zvažte upgrade pomocí pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Seznam maker úspěšně načten.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Načítání popisu...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Načítání informací z</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Pro tento doplněk je dostupná aktualizace.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Toto rozšíření je již nainstalováno.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Načítání informací z gitu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Načítání informací z wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython nenalezen. Použijte standardní způsob stažení.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Vaše verze pythonu pravděpodobně nepodporuje ZIP soubory. Nelze pokračovat.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Pracovní prostředí bylo úspěšně nainstalováno. Pro aplikaci změn prosím restartujte FreeCAD.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Chybí pracovní prostředí</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Chybějící modul python</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Chybí volitelný modul pythonu (nebrání instalaci)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Byly nalezeny chyby, které brání instalaci tohoto pracovního prostředí</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Nejprve prosím nainstalujte chybějící komponenty.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Chyba: Nelze stáhnout</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Úspěšně nainstalováno</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython není nainstalován! Nelze načíst makra z gitu</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Nainstalováno</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Je vyžadován restart</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Toto makro je již nainstalováno.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Nelze načíst kód tohoto makra.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Makro bylo nainstalováno a je k dispozici v menu Makro -&gt; Makra</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Tento doplněk je označen jako zastaralý</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>To obvykle znamená, že již není udržován a některé pokročilejší doplňky v tomto seznamu poskytují stejnou funkčnost.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Chyba: Nelze najít zip z</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Něco se pokazilo s Git Macro Retrieval, možná není spustitelný Git v cestě</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Tento doplněk je označen pouze jako Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Tento pracovní prostředí již nemusí být udržován a instalace do systému Python 3 bude mít pravděpodobně za následek chyby při startu nebo při používání.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Uživatel požádal o aktualizaci pracovního prostředí Pythonu 2 do systému, který používá Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Pracovní prostředí bylo úspěšně aktualizováno. Pro aplikaci změn prosím restartujte FreeCAD.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Uživatel požádal o instalaci pracovního prostředí Pythonu 2 do systému, který používá Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Zdá se, že je problém s připojením k Wiki, proto momentálně nelze získat seznam maker Wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Zobrazit čisté markdown</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Chybí python knihovna Markdown.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Pracovní prostředí</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makra</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Spustit</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Stahování informací...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Aktualizovat vše</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Spustí vybrané makro pokud je nainstalováno</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Odinstaluje vybrané makro nebo pracovní prostředí</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instaluje nebo aktualizuje vybrané makro nebo pracovní prostředí</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Stáhnout a použít všechny dostupné aktualizace</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Vlastní repozitáře (jeden na řádek):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Nastaví možnosti konfigurace pro správce doplňků</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Konfigurovat...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Možnosti správce doplňků</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Odinstalovat vybrané</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instalovat/aktualizovat vybrané</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Zavřít</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Zvolíte-li tuto možnost, budou pro nainstalované doplňky při spouštění
-správce doplňků, zkontrolovány dostupné aktualizace
-(vyžaduje to balíček GitPythonu nainstalovaný ve vašem systému)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Automaticky kontrolovat aktualizace při startu (vyžaduje GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Nepoužívat proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Systémová proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Uživatelem definované proxy :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Správce rozšíření</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Zavřít správce doplňků</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Toto okno můžete použít k určení dalších repozitářů doplňků,
-které mají být prohledány pro dostupné doplňky</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Nelze načíst popis tohto makra.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ které mají být prohledány pro dostupné doplňky</translation>
       <translation>Spravovat externí pracovní prostředí a makra</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Správce rozšíření</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Pracovní prostředí</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makra</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Spustí vybrané makro pokud je nainstalováno</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Spustit</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Nastaví možnosti konfigurace pro správce doplňků</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Konfigurovat...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Stahování informací...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Odinstaluje vybrané makro nebo pracovní prostředí</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Odinstalovat vybrané</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instaluje nebo aktualizuje vybrané makro nebo pracovní prostředí</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instalovat/aktualizovat vybrané</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Stáhnout a použít všechny dostupné aktualizace</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Aktualizovat vše</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Zavřít správce doplňků</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Zavřít</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Možnosti správce doplňků</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Zvolíte-li tuto možnost, budou pro nainstalované doplňky při spouštění
+správce doplňků, zkontrolovány dostupné aktualizace
+(vyžaduje to balíček GitPythonu nainstalovaný ve vašem systému)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Automaticky kontrolovat aktualizace při startu (vyžaduje GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Vlastní repozitáře (jeden na řádek):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Toto okno můžete použít k určení dalších repozitářů doplňků,
+které mají být prohledány pro dostupné doplňky</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Nepoužívat proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Systémová proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Uživatelem definované proxy :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_de.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="de" sourcelanguage="en">
+<TS version="2.1" language="de" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Der Code dieses Makros kann nicht abgerufen werden.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Die Addon-Liste konnte nicht geladen werden.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Eine Beschreibung für dieses Makro kann nicht abgerufen werden.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Die Liste der Arbeitsbereiche wurde aktualisiert.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Es wurde eine veraltete GitPython-Version erkannt, erwäge das Upgrade mit Pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Die Makro-Liste wurde erfolgreich abgerufen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython is nicht installiert! Makros können nicht von Git abgerufen werden</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Ein Fehler ist bei der Git-Makro Abfrage aufgetreten, möglicherweise befindet sich die ausführbare Git-Datei nicht in dem Pfad</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Anscheinend ist ein Problem beim Verbinden mit dem Wiki aufgetreten, daher kann die Wiki-Makroliste zu diesem Zeitpunkt nicht abgerufen werden</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Beschreibung wird abgerufen...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Informationen werden abgerufen von</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Unbearbeitetes Markdown angezeigt</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Python Markdown Bibliothek fehlt.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Für dieses Addon ist ein Update verfügbar.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Dieses Addon ist bereits installiert.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Dieses Addon ist als veraltet markiert</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Dies bedeutet normalerweise, dass es nicht mehr gewartet wird und ein fortschrittlicheres Addon in dieser Liste die gleiche Funktionalität bietet.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Dieses Addon ist als nur für Python 2 gekennzeichnet</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Dieser Arbeitsbereich wird möglicherweise nicht mehr gewartet und die Installation auf einem Python-3-System wird höchstwahrscheinlich zu Fehlern beim Start oder während der Nutzung führen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Informationen werden von Git abgerufen</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Informationen werden aus den Wiki abgerufen</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Dieses Makro ist bereits installiert.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython wurde nicht gefunden. Stattdessen wird der Standarddownload verwendet.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Ihre Version von Python scheint ZIP-Dateien nicht zu unterstützen. Aktion kann nicht fortgesetzt werden.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Der Benutzer hat die Aktualisierung eines Python-2-Arbeitsbereichs auf einem System mit Python 3 angefordert - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Arbeitsbreich erfolgreich aktualisiert. Bitte starten Sie FreeCAD neu, um die Änderungen zu übernehmen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Der Benutzer hat die Installation eines Python-2-Arbeitsbereichs auf einem System mit Python 3 angefordert - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Arbeitsbreich erfolgreich installiert. Bitte starten Sie FreeCAD neu, um die Änderungen anzuwenden.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Ein Makro wurde installiert und ist verfügbar unter Makro -&gt; Makros-Menü</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Fehlender Arbeitsbereich</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Fehlendes Python-Modul</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Fehlendes optionales Python-Modul (verhindert nicht die Installation)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Einige Fehler verhindern die Installation dieses Arbeitsbereiches</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Bitte installieren Sie zuerst die fehlenden Komponenten.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Fehler: Zip-Datei kann nicht gefunden werden von</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Fehler: Download nicht möglich</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Installation erfolgreich</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Addon-Manager</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Sie müssen FreeCAD neu starten, um die Änderungen anzuwenden. Drücken Sie Ok, um FreeCAD jetzt neu zu starten, oder Abbrechen, um später neu zu starten.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Kein Update verfügbar</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Installiert</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Das Makro konnte nicht entfernt werden.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Die Addon-Liste konnte nicht geladen werden.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Die Liste der Arbeitsbereiche wurde aktualisiert.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Es wurde eine veraltete GitPython-Version erkannt, erwäge das Upgrade mit Pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Die Makro-Liste wurde erfolgreich abgerufen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Beschreibung wird abgerufen...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Informationen werden abgerufen von</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Für dieses Addon ist ein Update verfügbar.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Dieses Addon ist bereits installiert.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Informationen werden von Git abgerufen</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Informationen werden aus den Wiki abgerufen</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython wurde nicht gefunden. Stattdessen wird der Standarddownload verwendet.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Ihre Version von Python scheint ZIP-Dateien nicht zu unterstützen. Aktion kann nicht fortgesetzt werden.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Arbeitsbreich erfolgreich installiert. Bitte starten Sie FreeCAD neu, um die Änderungen anzuwenden.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Fehlender Arbeitsbereich</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Fehlendes Python-Modul</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Fehlendes optionales Python-Modul (verhindert nicht die Installation)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Einige Fehler verhindern die Installation dieses Arbeitsbereiches</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Bitte installieren Sie zuerst die fehlenden Komponenten.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Fehler: Download nicht möglich</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Installation erfolgreich</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython is nicht installiert! Makros können nicht von Git abgerufen werden</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Installiert</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,205 +282,14 @@
       <translation>Neustart erforderlich</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Dieses Makro ist bereits installiert.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Der Code dieses Makros kann nicht abgerufen werden.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Ein Makro wurde installiert und ist verfügbar unter Makro -&gt; Makros-Menü</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Dieses Addon ist als veraltet markiert</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Dies bedeutet normalerweise, dass es nicht mehr gewartet wird und ein fortschrittlicheres Addon in dieser Liste die gleiche Funktionalität bietet.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Fehler: Zip-Datei kann nicht gefunden werden von</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Ein Fehler ist bei der Git-Makro Abfrage aufgetreten, möglicherweise befindet sich die ausführbare Git-Datei nicht in dem Pfad</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Dieses Addon ist als nur für Python 2 gekennzeichnet</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Dieser Arbeitsbereich wird möglicherweise nicht mehr gewartet und die Installation auf einem Python-3-System wird höchstwahrscheinlich zu Fehlern beim Start oder während der Nutzung führen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Der Benutzer hat die Aktualisierung eines Python-2-Arbeitsbereichs auf einem System mit Python 3 angefordert - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Arbeitsbreich erfolgreich aktualisiert. Bitte starten Sie FreeCAD neu, um die Änderungen zu übernehmen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Der Benutzer hat die Installation eines Python-2-Arbeitsbereichs auf einem System mit Python 3 angefordert - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Anscheinend ist ein Problem beim Verbinden mit dem Wiki aufgetreten, daher kann die Wiki-Makroliste zu diesem Zeitpunkt nicht abgerufen werden</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Unbearbeitetes Markdown angezeigt</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Python Markdown Bibliothek fehlt.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Arbeitsbereiche</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makros</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Ausführen</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Info wird heruntergeladen...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Alle aktualisieren</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Führt das ausgewählte Makro aus, sofern installiert</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Deinstalliert ein ausgewähltes Makro oder einen Arbeitsbereich</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Installiert oder aktualisiert das ausgewählte Makro oder den gewählten Arbeitsbereich</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Alle verfügbaren Updates herunterladen und anwenden</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Eigene Ablageordner (einer pro Zeile):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Setzt Konfigurationsoptionen für den Addon-Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Konfigurieren...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Addon-Manager-Optionen</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Ausgewählte deinstallieren</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Ausgewählte installieren/aktualisieren</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Schließen</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Wenn diese Option ausgewählt ist, werden installierte Addons beim Starten des Addon-Manager auf verfügbare Updates überprüft. (Das GitPython Paket muss dazu auf ihrem System installiert sein)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Automatisch beim Start nach Updates suchen (benötigt GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Kein Proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Benutzer-System-Proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Benutzerdefinierter Proxy:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Addon-Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Addon-Manager schließen</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Dieses Fenster kann verwendet werden, um zusätzliche Addon-Ablageordner auszuwählen, die nach verfügbaren Addons durchsucht werden</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Eine Beschreibung für dieses Makro kann nicht abgerufen werden.</translation>
     </message>
   </context>
   <context>
@@ -421,4 +305,135 @@ to be scanned for available addons</source>
       <translation>Externe Arbeitsbereiche und Makros verwalten</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Addon-Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Arbeitsbereiche</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makros</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Führt das ausgewählte Makro aus, sofern installiert</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Ausführen</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Setzt Konfigurationsoptionen für den Addon-Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Konfigurieren...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Info wird heruntergeladen...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Deinstalliert ein ausgewähltes Makro oder einen Arbeitsbereich</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Ausgewählte deinstallieren</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Installiert oder aktualisiert das ausgewählte Makro oder den gewählten Arbeitsbereich</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Ausgewählte installieren/aktualisieren</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Alle verfügbaren Updates herunterladen und anwenden</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Alle aktualisieren</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Addon-Manager schließen</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Schließen</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Addon-Manager-Optionen</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Wenn diese Option ausgewählt ist, werden installierte Addons beim Starten des Addon-Manager auf verfügbare Updates überprüft. (Das GitPython Paket muss dazu auf ihrem System installiert sein)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Automatisch beim Start nach Updates suchen (benötigt GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Eigene Ablageordner (einer pro Zeile):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Dieses Fenster kann verwendet werden, um zusätzliche Addon-Ablageordner auszuwählen, die nach verfügbaren Addons durchsucht werden</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Kein Proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Benutzer-System-Proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Benutzerdefinierter Proxy:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_el.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="el" sourcelanguage="en">
+<TS version="2.1" language="el" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Δεν είναι δυνατή η λήψη του κώδικα αυτής της μακροεντολής.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Δεν είναι δυνατή η λήψη λίστας πρόσθετων.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Δεν είναι δυνατή η ανάκτηση μιας περιγραφής για αυτή τη μακροεντολή.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Ενημερώθηκε η λίστα πάγκων εργασίας.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Ανιχνεύθηκε ξεπερασμένη έκδοση GitPython, εξετάστε το ενδεχόμενο αναβάθμισης με το pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Η λίστα μακροεντολών ανακτήθηκε επιτυχώς.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation type="unfinished">GitPython not installed! Cannot retrieve macros from git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation type="unfinished">Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation type="unfinished">Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Ανάκτηση περιγραφής...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Ανάκτηση πληροφοριών από</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation type="unfinished">Raw markdown displayed</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation type="unfinished">Python Markdown library is missing.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Υπάρχει διαθέσιμη ενημέρωση για αυτό το πρόσθετο.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Αυτό το πρόσθετο είναι ήδη εγκατεστημένο.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation type="unfinished">This addon is marked as obsolete</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation type="unfinished">This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation type="unfinished">This addon is marked as Python 2 Only</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation type="unfinished">This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Ανάκτηση πληροφοριών από το git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Ανάκτηση πληροφοριών από το wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation type="unfinished">This macro is already installed.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation type="unfinished">GitPython not found. Using standard download instead.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Η δικιά σας έκδοση της python δεν φαίνεται να υποστηρίζει αρχεία ZIP. Δεν είναι δυνατή η συνέχιση.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation type="unfinished">User requested updating a Python 2 workbench on a system running Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation type="unfinished">Workbench successfully updated. Please restart FreeCAD to apply the changes.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation type="unfinished">User requested installing a Python 2 workbench on a system running Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Ο πάγκος εργασίας εγκαταστάθηκε επιτυχώς. Παρακαλώ επανεκκινήστε το FreeCAD για να εφαρμόσετε τις αλλαγές.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation type="unfinished">A macro has been installed and is available under Macro -&gt; Macros menu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation type="unfinished">Missing workbench</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation type="unfinished">Missing python module</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation type="unfinished">Missing optional python module (doesn&apos;t prevent installing)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Βρέθηκαν κάποια σφάλματα που εμποδίζουν την εγκατάσταση αυτού του πάγκου εργασίας</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation type="unfinished">Please install the missing components first.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation type="unfinished">Error: Unable to locate zip from</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Σφάλμα: Δεν είναι δυνατή η λήψη</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Επιτυχής εγκατάσταση</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Διαχειριστής προσθέτων</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Πρέπει να γίνει επανεκκίνηση του FreeCad για να εφαρμοστούν οι αλλαγές. Πατήστε Ok για να επανεκκινήσετε το FreeCAD τώρα, ή Cancel για να γίνει επανεκκίνηση αργότερα.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Δεν υπάρχει διαθέσιμη ενημέρωση</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Εγκατεστημένο</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Η μακροεντολή δεν μπορεί να αφαιρεθεί.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Δεν είναι δυνατή η λήψη λίστας πρόσθετων.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Ενημερώθηκε η λίστα πάγκων εργασίας.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Ανιχνεύθηκε ξεπερασμένη έκδοση GitPython, εξετάστε το ενδεχόμενο αναβάθμισης με το pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Η λίστα μακροεντολών ανακτήθηκε επιτυχώς.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Ανάκτηση περιγραφής...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Ανάκτηση πληροφοριών από</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Υπάρχει διαθέσιμη ενημέρωση για αυτό το πρόσθετο.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Αυτό το πρόσθετο είναι ήδη εγκατεστημένο.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Ανάκτηση πληροφοριών από το git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Ανάκτηση πληροφοριών από το wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation type="unfinished">GitPython not found. Using standard download instead.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Η δικιά σας έκδοση της python δεν φαίνεται να υποστηρίζει αρχεία ZIP. Δεν είναι δυνατή η συνέχιση.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Ο πάγκος εργασίας εγκαταστάθηκε επιτυχώς. Παρακαλώ επανεκκινήστε το FreeCAD για να εφαρμόσετε τις αλλαγές.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation type="unfinished">Missing workbench</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation type="unfinished">Missing python module</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation type="unfinished">Missing optional python module (doesn&apos;t prevent installing)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Βρέθηκαν κάποια σφάλματα που εμποδίζουν την εγκατάσταση αυτού του πάγκου εργασίας</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation type="unfinished">Please install the missing components first.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Σφάλμα: Δεν είναι δυνατή η λήψη</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Επιτυχής εγκατάσταση</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation type="unfinished">GitPython not installed! Cannot retrieve macros from git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Εγκατεστημένο</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Απαιτείται επανεκκίνηση</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation type="unfinished">This macro is already installed.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Δεν είναι δυνατή η λήψη του κώδικα αυτής της μακροεντολής.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation type="unfinished">A macro has been installed and is available under Macro -&gt; Macros menu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation type="unfinished">This addon is marked as obsolete</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation type="unfinished">This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation type="unfinished">Error: Unable to locate zip from</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation type="unfinished">Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation type="unfinished">This addon is marked as Python 2 Only</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation type="unfinished">This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation type="unfinished">User requested updating a Python 2 workbench on a system running Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation type="unfinished">Workbench successfully updated. Please restart FreeCAD to apply the changes.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation type="unfinished">User requested installing a Python 2 workbench on a system running Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation type="unfinished">Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation type="unfinished">Raw markdown displayed</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation type="unfinished">Python Markdown library is missing.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Πάγκοι Εργασίας</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Μακροεντολές</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Εκτέλεση</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Γίνεται λήψη πληροφοριών...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Ενημέρωση όλων</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation type="unfinished">Executes the selected macro, if installed</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation type="unfinished">Uninstalls a selected macro or workbench</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation type="unfinished">Installs or updates the selected macro or workbench</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation type="unfinished">Download and apply all available updates</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation type="unfinished">Custom repositories (one per line):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation type="unfinished">Sets configuration options for the Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation type="unfinished">Configure...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation type="unfinished">Addon manager options</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation type="unfinished">Uninstall selected</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation type="unfinished">Install/update selected</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Κλείσιμο</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation type="unfinished">If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation type="unfinished">Automatically check for updates at start (requires GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation type="unfinished">Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation type="unfinished">No proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation type="unfinished">User system proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation type="unfinished">User defined proxy :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation type="unfinished">Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation type="unfinished">Close the Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation type="unfinished">You can use this window to specify additional addon repositories
-to be scanned for available addons</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Δεν είναι δυνατή η ανάκτηση μιας περιγραφής για αυτή τη μακροεντολή.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ to be scanned for available addons</translation>
       <translation type="unfinished">Manage external workbenches and macros</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation type="unfinished">Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Πάγκοι Εργασίας</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Μακροεντολές</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation type="unfinished">Executes the selected macro, if installed</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Εκτέλεση</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation type="unfinished">Sets configuration options for the Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation type="unfinished">Configure...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Γίνεται λήψη πληροφοριών...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation type="unfinished">Uninstalls a selected macro or workbench</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation type="unfinished">Uninstall selected</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation type="unfinished">Installs or updates the selected macro or workbench</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation type="unfinished">Install/update selected</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation type="unfinished">Download and apply all available updates</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Ενημέρωση όλων</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation type="unfinished">Close the Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Κλείσιμο</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation type="unfinished">Addon manager options</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation type="unfinished">If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation type="unfinished">Automatically check for updates at start (requires GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation type="unfinished">Custom repositories (one per line):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation type="unfinished">You can use this window to specify additional addon repositories
+to be scanned for available addons</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation type="unfinished">Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation type="unfinished">No proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation type="unfinished">User system proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation type="unfinished">User defined proxy :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_es-AR.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="es-AR" sourcelanguage="en">
+<TS version="2.1" language="es-AR" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>No se puede obtener el código de esta macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>No se puede descargar la lista de complementos.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>No se puede recuperar una descripción para esta macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Se actualizó la lista de Entornos de trabajo.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Se ha detectado GitPython obsoleto, considere actualizar con pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>La lista de macros fue recuperada con éxito.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>¡GitPython no instalado! No se pueden recuperar macros desde git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Algo salió mal con la recuperación de Macro de Git, posiblemente el ejecutable de Git no está en la ruta</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Parece ser un problema para conectarse a la Wiki, por lo tanto, no se puede recuperar la lista de macros de la Wiki en este momento</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Recuperando descripción...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Recuperando información de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Markdown sin procesar mostrada</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Falta la biblioteca Python Markdown.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Una actualización está disponible para este complemento.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Este complemento ya está instalado.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Este complemento está marcado como obsoleto</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Esto generalmente significa que ya no está mantenido, y algún complemento más avanzado en esta lista proporciona la misma funcionalidad.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Este complemento está marcado solo con Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Este Entorno de trabajo ya no se mantiene, instalarlo en un sistema con Python 3 probablemente provocará errores al ejecutarse o utilizarse.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Recuperando información de git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Recuperando información de wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Esta macro ya está instalada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython no encontrado. Utilizando descarga estándar en su lugar.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Su versión de python n&apos;o parece ser compatible con archivos ZIP. No es posible proceder.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>El usuario solicitó actualizar un Entorno de trabajo Python 2 en un sistema que ejecuta Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Entorno de Trabajo actualizado con éxito. Reinicie FreeCAD para aplicar los cambios.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>El usuario solicitó instalar un Entorno de trabajo Python 2 en un sistema que ejecuta Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Entorno de trabajo instalado correctamente. Reinicie FreeCAD para aplicar los cambios.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Una macro ha sido instalada y está disponible en el menú Macro -&gt; Macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Falta el Entorno de trabajo</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Falta módulo python</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Falta módulo opcional de python (n&apos;o impide la instalación)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Se encontraron algunos errores que impiden instalar este Entorno de trabajo</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Por favor, instale los componentes que faltan primero.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Error: No se puede localizar zip desde</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Error: No se puede descargar</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Instalado correctamente</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Administrador de complementos</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Debe reiniciar FreeCAD para que los cambios surtan efecto. Presione Aceptar para reiniciar FreeCAD ahora, o Cancelar para reiniciar más tarde.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>No hay actualizaciones disponibles</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Instalado</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>La macro no pudo ser eliminada.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>No se puede descargar la lista de complementos.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Se actualizó la lista de Entornos de trabajo.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Se ha detectado GitPython obsoleto, considere actualizar con pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>La lista de macros fue recuperada con éxito.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Recuperando descripción...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Recuperando información de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Una actualización está disponible para este complemento.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Este complemento ya está instalado.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Recuperando información de git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Recuperando información de wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython no encontrado. Utilizando descarga estándar en su lugar.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Su versión de python n&apos;o parece ser compatible con archivos ZIP. No es posible proceder.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Entorno de trabajo instalado correctamente. Reinicie FreeCAD para aplicar los cambios.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Falta el Entorno de trabajo</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Falta módulo python</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Falta módulo opcional de python (n&apos;o impide la instalación)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Se encontraron algunos errores que impiden instalar este Entorno de trabajo</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Por favor, instale los componentes que faltan primero.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Error: No se puede descargar</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Instalado correctamente</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>¡GitPython no instalado! No se pueden recuperar macros desde git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Instalado</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Es necesario reiniciar</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Esta macro ya está instalada.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>No se puede obtener el código de esta macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Una macro ha sido instalada y está disponible en el menú Macro -&gt; Macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Este complemento está marcado como obsoleto</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Esto generalmente significa que ya no está mantenido, y algún complemento más avanzado en esta lista proporciona la misma funcionalidad.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Error: No se puede localizar zip desde</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Algo salió mal con la recuperación de Macro de Git, posiblemente el ejecutable de Git no está en la ruta</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Este complemento está marcado solo con Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Este Entorno de trabajo ya no se mantiene, instalarlo en un sistema con Python 3 probablemente provocará errores al ejecutarse o utilizarse.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>El usuario solicitó actualizar un Entorno de trabajo Python 2 en un sistema que ejecuta Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Entorno de Trabajo actualizado con éxito. Reinicie FreeCAD para aplicar los cambios.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>El usuario solicitó instalar un Entorno de trabajo Python 2 en un sistema que ejecuta Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Parece ser un problema para conectarse a la Wiki, por lo tanto, no se puede recuperar la lista de macros de la Wiki en este momento</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Markdown sin procesar mostrada</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Falta la biblioteca Python Markdown.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Entornos de trabajo</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macros</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Ejecutar</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Descargando información...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Actualizar todo</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Ejecuta la macro seleccionada, si está instalada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Desinstala una macro o entorno de trabajo seleccionado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instala o actualiza la macro o el entorno de trabajo seleccionado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Descargar y aplicar todas las actualizaciones disponibles</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repositorios personalizados (uno por línea):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Establece opciones de configuración para el Administrador de Complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configurar...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opciones de administrador de complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Desinstalar seleccionados</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instalar/actualizar seleccionados</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Cerrar</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Si esta opción está seleccionada, al iniciar el Administrador de Complementos,
-los complementos instalados serán revisados por actualizaciones disponibles
-(esto requiere el paquete GitPython instalado en su sistema)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Comprobar actualizaciones automáticamente al inicio (requiere GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Sin proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Proxy del sistema de usuario</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy definido por el usuario :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Administrador de Complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Cerrar el Administrador de Complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Puede usar esta ventana para especificar repositorios adicionales de complementos
-para ser escaneado en busca de complementos disponibles</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>No se puede recuperar una descripción para esta macro.</translation>
     </message>
   </context>
   <context>
@@ -421,7 +302,141 @@ para ser escaneado en busca de complementos disponibles</translation>
     <message>
       <location filename="AddonManager.py" line="69"/>
       <source>Manage external workbenches and macros</source>
-      <translation>Administrar Entornos de trabajo externos y macros</translation>
+      <translation>Administra entornos de trabajo externos y macros</translation>
+    </message>
+  </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Administrador de Complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Entornos de trabajo</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macros</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Ejecuta la macro seleccionada, si está instalada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Ejecutar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Establece opciones de configuración para el Administrador de Complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configurar...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Descargando información...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Desinstala una macro o entorno de trabajo seleccionado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Desinstalar seleccionados</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instala o actualiza la macro o el entorno de trabajo seleccionado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instalar/actualizar seleccionados</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Descarga y aplica todas las actualizaciones disponibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Actualizar todo</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Cierra el Administrador de Complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Cerrar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opciones de administrador de complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Si esta opción está seleccionada, al iniciar el Administrador de Complementos,
+los complementos instalados serán revisados por actualizaciones disponibles
+(esto requiere el paquete GitPython instalado en su sistema)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Comprobar actualizaciones automáticamente al inicio (requiere GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repositorios personalizados (uno por línea):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Puede usar esta ventana para especificar repositorios adicionales de complementos
+para ser escaneado en busca de complementos disponibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Sin proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Proxy del sistema de usuario</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy definido por el usuario :</translation>
     </message>
   </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_es-ES.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="es-ES" sourcelanguage="en">
+<TS version="2.1" language="es-ES" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>No se puede obtener el código de esta macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>No se puede descargar la lista de complementos.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>No se puede recuperar una descripción para esta macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Lista de entornos de trabajo actualizada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Detectado GitPython caducado, considere actualizar con pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>La lista de macros fue recuperada con éxito.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>¡GitPython no instalado! No se pueden recuperar macros desde git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Algo salió mal con la recuperación de instrucciones de Git, posiblemente el ejecutable de Git no está en la ruta</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Parece ser un problema al conectarse a la Wiki, por lo tanto no puede recuperar la lista de macros del Wiki en este momento</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Recuperando la descripción...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Recuperando información de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Markdown sin procesar mostrado</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Falta la biblioteca Python Markdown.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Una actualización está disponible para este complemento.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Este complemento ya está instalado.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Este complemento está marcado como obsoleto</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Esto generalmente significa que ya no está mantenido, y algún complemento más avanzado en esta lista proporciona la misma funcionalidad.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Este complemento está marcado solo con Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Este banco de trabajo ya no se mantiene, instalarlo en un sistema con Python 3 probablemente provocará errores al ejecutarse o utilizarse.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Recuperando información de git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Recuperando información de wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Esta macro ya está instalada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython no encontrado. Utilizando descarga estándar en su lugar.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Su versión de python no parece ser compatible con archivos ZIP. No es posible proceder.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>El usuario solicita actualizar un banco de trabajo con Python 2 en un sistema que ejecuta Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Banco de trabajo actualizado con éxito. Reinicie FreeCAD para aplicar los cambios.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>El usuario solicita instalar un banco de trabajo Python 2 en un sistema que ejecuta Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>El entorno de trabajo se ha instalado correctamente. Reinicie FreeCAD para aplicar los cambios.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Una macro ha sido instalada y está disponible en el menú Macro -&gt; Macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Falta el entorno de trabajo</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Falta módulo python</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Falta módulo opcional de python (no impide la instalación)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Se han encontrado algunos errores que impiden instalar este entorno de trabajo</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Por favor, instale los componentes que faltan primero.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Error: No se puede localizar zip desde</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Error: No se puede descargar</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Se ha instalado correctamente</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Administrador de complementos</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Debe reiniciar FreeCAD para que los cambios surtan efecto. Pulse Ok para reiniciar FreeCAD ahora, o Cancelar para reiniciar más tarde.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Ninguna actualización disponible</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Instalado</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>No se pudo quitar el Macro.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>No se puede descargar la lista de complementos.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Lista de entornos de trabajo actualizada.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Detectado GitPython caducado, considere actualizar con pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>La lista de macros fue recuperada con éxito.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Recuperando la descripción...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Recuperando información de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Una actualización está disponible para este complemento.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Este complemento ya está instalado.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Recuperando información de git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Recuperando información de wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython no encontrado. Utilizando descarga estándar en su lugar.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Su versión de python no parece ser compatible con archivos ZIP. No es posible proceder.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>El entorno de trabajo se ha instalado correctamente. Reinicie FreeCAD para aplicar los cambios.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Falta el entorno de trabajo</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Falta módulo python</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Falta módulo opcional de python (no impide la instalación)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Se han encontrado algunos errores que impiden instalar este entorno de trabajo</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Por favor, instale los componentes que faltan primero.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Error: No se puede descargar</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Se ha instalado correctamente</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>¡GitPython no instalado! No se pueden recuperar macros desde git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Instalado</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,207 +282,14 @@
       <translation>Es necesario reiniciar</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Esta macro ya está instalada.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>No se puede obtener el código de esta macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Una macro ha sido instalada y está disponible en el menú Macro -&gt; Macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Este complemento está marcado como obsoleto</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Esto generalmente significa que ya no está mantenido, y algún complemento más avanzado en esta lista proporciona la misma funcionalidad.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Error: No se puede localizar zip desde</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Algo salió mal con la recuperación de instrucciones de Git, posiblemente el ejecutable de Git no está en la ruta</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Este complemento está marcado solo con Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Este banco de trabajo ya no se mantiene, instalarlo en un sistema con Python 3 probablemente provocará errores al ejecutarse o utilizarse.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>El usuario solicita actualizar un banco de trabajo con Python 2 en un sistema que ejecuta Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Banco de trabajo actualizado con éxito. Reinicie FreeCAD para aplicar los cambios.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>El usuario solicita instalar un banco de trabajo Python 2 en un sistema que ejecuta Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Parece ser un problema al conectarse a la Wiki, por lo tanto no puede recuperar la lista de macros del Wiki en este momento</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Markdown sin procesar mostrado</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Falta la biblioteca Python Markdown.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Escenarios</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macros</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Ejecutar</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Descargando información...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Actualizar todo</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Ejecuta la macro seleccionada, si está instalada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Desinstala una macro o entorno de trabajo seleccionado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instala o actualiza la macro o el entorno de trabajo seleccionado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Descargar y aplicar todas las actualizaciones disponibles</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repositorios personalizados (uno por línea):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Establece opciones de configuración para el Administrador de complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configurar...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opciones de administrador de complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Desinstalar el seleccionado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instalar/actualizar el seleccionado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Cerrar</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Si se selecciona esta opción, al iniciar el Administrador de Complementos, los complementos instalados serán revisados para ver si hay actualizaciones disponibles
-(esto requiere el paquete GitPython instalado en tu sistema)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Comprobar automáticamente actualizaciones al inicio (requiere GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Sin proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Proxy del usuario de sistema</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy definido por el usuario :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Gestor de complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Cerrar el gestor de complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Puede usar esta ventana para especificar repositorios de complementos adicionales
-a ser escaneados para los complementos disponibles</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>No se puede recuperar una descripción para esta macro.</translation>
     </message>
   </context>
   <context>
@@ -423,4 +305,137 @@ a ser escaneados para los complementos disponibles</translation>
       <translation>Administrar entornos de trabajo y macros externas</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Gestor de complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Escenarios</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macros</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Ejecuta la macro seleccionada, si está instalada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Ejecutar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Establece opciones de configuración para el Administrador de complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configurar...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Descargando información...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Desinstala una macro o entorno de trabajo seleccionado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Desinstalar el seleccionado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instala o actualiza la macro o el entorno de trabajo seleccionado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instalar/actualizar el seleccionado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Descargar y aplicar todas las actualizaciones disponibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Actualizar todo</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Cerrar el gestor de complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Cerrar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opciones de administrador de complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Si se selecciona esta opción, al iniciar el Administrador de Complementos, los complementos instalados serán revisados para ver si hay actualizaciones disponibles
+(esto requiere el paquete GitPython instalado en tu sistema)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Comprobar automáticamente actualizaciones al inicio (requiere GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repositorios personalizados (uno por línea):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Puede usar esta ventana para especificar repositorios de complementos adicionales
+a ser escaneados para los complementos disponibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Sin proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Proxy del usuario de sistema</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy definido por el usuario :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_eu.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="eu" sourcelanguage="en">
+<TS version="2.1" language="eu" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Ezin izan da makro honen kodea eskuratu.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Ezin izan da gehigarrien zerrenda deskargatu.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Ezin izan da makro honen deskribapen bat eskuratu.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Lan-mahaien zerrenda eguneratu da.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>GitPython zaharkitua detektatu da, eguneratu ezazu pip bidez.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Makroen zerrenda ongi atzitu da.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython ez dago instalatuta! Ezin dira makroak atzitu git biltegitik</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Zerbait gaizki atera da Git makroak atzitzean, ziur aski Git exekutagarria ez dago bidean</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Badirudi arazo bat dagoela wikiarekin konektatzean, ezin da atzitu wikiko makroen zerrenda momentu honetan</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Deskribapena atzitzen...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Informazioa berreskuratzen hemendik</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Markdown gordina bistaratzen ari da.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Python Markdown liburutegia falta da.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Eguneraketa bat eskuragarri dago gehigarri honetarako.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Gehigarri hau instalatuta dago.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Gehigarri hau zaharkituta dago</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Horrek esan nahi du ez dela mantentzen eta zerrenda honetako gehigarri aurreratuagoren batek funtzionaltasun bera eskaintzen duela.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Gehigarri hau Python 2 bertsiorako soilik da</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Lan-mahai honek beharbada ez du jadanik mantenimendurik eta Python 3 duen sistema batean instalatzen bada erroreak sortu ditzake bai abioan bai erabiltzen ari denean.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Informazioa atzitzen git biltegitik</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Informazioa atzitzen wikitik</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Makro hau instalatuta dago.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython ez da aurkitu. Deskarga estandarra erabiltzen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Badirudi zure Python bertsioak ez duela ZIP fitxategirik onartzen. Ezin da jarraitu.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Erabiltzaileak Python 2 lan-mahai bat eguneratzea eskatu du Python 3 duen sistema batean - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Lan-mahaia ongi eguneratu da. Berrabiarazi FreeCAD aldaketak aplikatzeko.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Erabiltzaileak Python 2 lan-mahai bat instalatzea eskatu du Python 3 duen sistema batean - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Lan-mahaia ongi instalatu da. Berrabiarazi FreeCAD aldaketak aplikatzeko.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Makro bat instalatu da eta 'Makroa -&gt; Makroak' menuan erabilgarri dago</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Lan-mahaia falta da</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Python modulua falta da</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Aukerako Python modulua falta da (ez du instalazioa eragozten)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Lan-mahai hau instalatzea eragozten duten zenbait errore aurkitu dira</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Instalatu falta diren osagaiak.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Errorea: Ezin izan da ZIP fitxategia aurkitu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Errorea: Ezin da deskargatu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Ongi instalatu da</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Gehigarrien kudeatzailea</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>FreeCAD berrabiarazi behar da aldaketak indarrean sartu daitezen. Sakatu 'Ados' FreeCAD orain berrabiarazteko edo 'Utzi' geroago berrabiarazteko.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Ez dago eguneraketarik eskuragarri</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Instalatuta</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Makroa ezin izan da kendu.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Ezin izan da gehigarrien zerrenda deskargatu.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Lan-mahaien zerrenda eguneratu da.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>GitPython zaharkitua detektatu da, eguneratu ezazu pip bidez.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Makroen zerrenda ongi atzitu da.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Deskribapena atzitzen...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Informazioa berreskuratzen hemendik</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Eguneraketa bat eskuragarri dago gehigarri honetarako.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Gehigarri hau instalatuta dago.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Informazioa atzitzen git biltegitik</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Informazioa atzitzen wikitik</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython ez da aurkitu. Deskarga estandarra erabiltzen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Badirudi zure Python bertsioak ez duela ZIP fitxategirik onartzen. Ezin da jarraitu.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Lan-mahaia ongi instalatu da. Berrabiarazi FreeCAD aldaketak aplikatzeko.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Lan-mahaia falta da</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Python modulua falta da</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Aukerako Python modulua falta da (ez du instalazioa eragozten)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Lan-mahai hau instalatzea eragozten duten zenbait errore aurkitu dira</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Instalatu falta diren osagaiak.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Errorea: Ezin da deskargatu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Ongi instalatu da</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython ez dago instalatuta! Ezin dira makroak atzitu git biltegitik</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Instalatuta</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Berrabiaraztea beharrezkoa da</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Makro hau instalatuta dago.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Ezin izan da makro honen kodea eskuratu.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Makro bat instalatu da eta 'Makroa -&gt; Makroak' menuan erabilgarri dago</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Gehigarri hau zaharkituta dago</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Horrek esan nahi du ez dela mantentzen eta zerrenda honetako gehigarri aurreratuagoren batek funtzionaltasun bera eskaintzen duela.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Errorea: Ezin izan da ZIP fitxategia aurkitu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Zerbait gaizki atera da Git makroak atzitzean, ziur aski Git exekutagarria ez dago bidean</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Gehigarri hau Python 2 bertsiorako soilik da</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Lan-mahai honek beharbada ez du jadanik mantenimendurik eta Python 3 duen sistema batean instalatzen bada erroreak sortu ditzake bai abioan bai erabiltzen ari denean.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Erabiltzaileak Python 2 lan-mahai bat eguneratzea eskatu du Python 3 duen sistema batean - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Lan-mahaia ongi eguneratu da. Berrabiarazi FreeCAD aldaketak aplikatzeko.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Erabiltzaileak Python 2 lan-mahai bat instalatzea eskatu du Python 3 duen sistema batean - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Badirudi arazo bat dagoela wikiarekin konektatzean, ezin da atzitu wikiko makroen zerrenda momentu honetan</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Markdown gordina bistaratzen ari da.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Python Markdown liburutegia falta da.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Lan-mahaiak</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makroak</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Exekutatu</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Informazioa deskargatzen...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Eguneratu dena</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Hautatutako makroa exekutatzen du, instalatuta badago</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Hautatutako makroa edo lan-mahaia desinstalatzen du</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Hautatutako makroa edo lan-mahaia instalatzen edo eguneratzen du</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Deskargatu eta aplikatu erabilgarri dauden eguneraketa guztiak</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Biltegi pertsonalizatuak (bat lerroko):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Gehigarrien kudeatzailearen konfigurazio-aukerak ezartzen ditu</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Konfiguratu...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Gehigarrien kudeatzailearen aukerak</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Desinstalazioa hautatu da</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instalazioa/eguneraketa hautatu da</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Itxi</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Aukera hau hautatuta badago, gehigarrien kudeatzailea abiarazten
-denean gehigarrien eguneraketarik dagoen begiratuko da
-(GitPython paketeak instalatuta egon behar du zure sisteman)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Automatikoki egiaztatu abioan eguneraketarik dagoen (GitPython behar du)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxya </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Proxyrik ez</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Erabili sistemaren proxya</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Erabilitzaileak definitutako proxya:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Gehigarrien kudeatzailea</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Itxi gehigarren kudeatzailea</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Leiho honetan biltegi gehiago zehaztu daitezke
-gehigarri erabilgarri gehiago bilatzeko</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Ezin izan da makro honen deskribapen bat eskuratu.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ gehigarri erabilgarri gehiago bilatzeko</translation>
       <translation>Kudeatu kanpoko lan-mahaiak eta makroak</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Gehigarrien kudeatzailea</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Lan-mahaiak</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makroak</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Hautatutako makroa exekutatzen du, instalatuta badago</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Exekutatu</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Gehigarrien kudeatzailearen konfigurazio-aukerak ezartzen ditu</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Konfiguratu...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Informazioa deskargatzen...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Hautatutako makroa edo lan-mahaia desinstalatzen du</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Desinstalazioa hautatu da</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Hautatutako makroa edo lan-mahaia instalatzen edo eguneratzen du</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instalazioa/eguneraketa hautatu da</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Deskargatu eta aplikatu erabilgarri dauden eguneraketa guztiak</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Eguneratu dena</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Itxi gehigarren kudeatzailea</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Itxi</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Gehigarrien kudeatzailearen aukerak</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Aukera hau hautatuta badago, gehigarrien kudeatzailea abiarazten
+denean gehigarrien eguneraketarik dagoen begiratuko da
+(GitPython paketeak instalatuta egon behar du zure sisteman)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Automatikoki egiaztatu abioan eguneraketarik dagoen (GitPython behar du)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Biltegi pertsonalizatuak (bat lerroko):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Leiho honetan biltegi gehiago zehaztu daitezke
+gehigarri erabilgarri gehiago bilatzeko</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxya </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Proxyrik ez</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Erabili sistemaren proxya</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Erabilitzaileak definitutako proxya:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_fi.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="fi" sourcelanguage="en">
+<TS version="2.1" language="fi" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Tämän makrokoodin noutaminen ei onnistunut.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Lisäosien luetteloa ei voida ladata.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Kuvausta tälle makrolle ei voitu noutaa.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Työpöytien luettelo on päivitetty.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Vanhentunut GitPython havaittu, harkitse päivitystä pip: n kanssa.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Luettelo makroista noudettu.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPythonia ei ole asennettu! Makroja ei voi noutaa git: stä</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Jotain meni pieleen Git Makron noutamisessa, ehkä Git-ohjelma ei ole polulla</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Näyttää siltä, että kyseessä on Wikiin yhdistämiseen liittyvä ongelma, joten Wiki makro -listaa ei voida hakea tällä hetkellä</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Haetaan kuvausta...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Haetaan tietoja</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Raw Markdown (muokkaamaton) näytetään</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Python Markdown kirjasto puuttuu.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Päivitys on saatavilla tälle lisäosalle.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Tämä lisäosa on jo asennettu.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Tämä lisäosa on merkitty vanhentuneeksi</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Tämä tarkoittaa yleensä sitä, että sitä ei enää ylläpidetä ja että tässä luettelossa on edistyneempiä lisäosia, mitkä tekevät saman toiminnallisuuden.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Tämä lisäosa on merkitty vain Python 2: lle</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Tätä työpöytää ei voida enää ylläpitää ja sen asentaminen Python 3 -järjestelmään johtaa todennäköisemmin virheisiin käynnistyksessä tai käytön aikana.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Haetaan tietoja git: stä</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Haetaan tietoja wikistä</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Tämä makro on jo asennettu.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPythonia ei löytynyt. Käytetään sen sijaan standardilatausta.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Sinun versiota pythonista ei &apos; löydy tukeakseen ZIP tiedostoja. Ei voida edetä.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Käyttäjä pyysi Python 2 -työpöydän päivittämistä Python 3 -järjestelmään </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Työpöytä asennettu onnistuneesti. Käynnistä FreeCAD uudelleen ottaaksesi muutokset käyttöön.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Käyttäjä pyysi Python 2 -työpöydän asentamista Python 3 -järjestelmässä - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Työpöytä asennettu onnistuneesti. Käynnistä FreeCAD uudelleen ottaaksesi muutokset käyttöön.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Makro on asennettu ja se on saatavilla makro -&gt; Makro -valikosta</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Työpöytä puuttuu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Python moduuli puuttuu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Valinnainen python-moduuli puuttuu (se &apos; estää asennuksen)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Joitakin virheitä havaittiin, mikä estää tämän työpöydän asentamisen</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Asenna ensin puuttuvat komponentit.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Virhe: Zip -tiedostoa ei voitu paikantaa</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Virhe: Lataaminen epäonnistui</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Asennettu onnistuneesti</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Lisäosien Hallinta</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Sinun on käynnistettävä FreeCAD uudelleen, jotta muutokset tulevat voimaan. Paina Ok käynnistäksesi FreeCAD nyt, tai Peruuta käynnistääksesi myöhemmin uudelleen.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Päivityksiä ei saatavana</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Asennettu</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Makroa ei voitu poistaa.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Lisäosien luetteloa ei voida ladata.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Työpöytien luettelo on päivitetty.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Vanhentunut GitPython havaittu, harkitse päivitystä pip: n kanssa.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Luettelo makroista noudettu.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Haetaan kuvausta...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Haetaan tietoja</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Päivitys on saatavilla tälle lisäosalle.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Tämä lisäosa on jo asennettu.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Haetaan tietoja git: stä</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Haetaan tietoja wikistä</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPythonia ei löytynyt. Käytetään sen sijaan standardilatausta.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Sinun versiota pythonista ei &apos; löydy tukeakseen ZIP tiedostoja. Ei voida edetä.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Työpöytä asennettu onnistuneesti. Käynnistä FreeCAD uudelleen ottaaksesi muutokset käyttöön.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Työpöytä puuttuu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Python moduuli puuttuu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Valinnainen python-moduuli puuttuu (se &apos; estää asennuksen)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Joitakin virheitä havaittiin, mikä estää tämän työpöydän asentamisen</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Asenna ensin puuttuvat komponentit.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Virhe: Lataaminen epäonnistui</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Asennettu onnistuneesti</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPythonia ei ole asennettu! Makroja ei voi noutaa git: stä</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Asennettu</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Uudelleenkäynnistys vaaditaan</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Tämä makro on jo asennettu.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Tämän makrokoodin noutaminen ei onnistunut.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Makro on asennettu ja se on saatavilla makro -&gt; Makro -valikosta</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Tämä lisäosa on merkitty vanhentuneeksi</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Tämä tarkoittaa yleensä sitä, että sitä ei enää ylläpidetä ja että tässä luettelossa on edistyneempiä lisäosia, mitkä tekevät saman toiminnallisuuden.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Virhe: Zip -tiedostoa ei voitu paikantaa</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Jotain meni pieleen Git Makron noutamisessa, ehkä Git-ohjelma ei ole polulla</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Tämä lisäosa on merkitty vain Python 2: lle</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Tätä työpöytää ei voida enää ylläpitää ja sen asentaminen Python 3 -järjestelmään johtaa todennäköisemmin virheisiin käynnistyksessä tai käytön aikana.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Käyttäjä pyysi Python 2 -työpöydän päivittämistä Python 3 -järjestelmään </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Työpöytä asennettu onnistuneesti. Käynnistä FreeCAD uudelleen ottaaksesi muutokset käyttöön.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Käyttäjä pyysi Python 2 -työpöydän asentamista Python 3 -järjestelmässä - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Näyttää siltä, että kyseessä on Wikiin yhdistämiseen liittyvä ongelma, joten Wiki makro -listaa ei voida hakea tällä hetkellä</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Raw Markdown (muokkaamaton) näytetään</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Python Markdown kirjasto puuttuu.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Työpöydät</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makrot</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Suorita</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Ladataan tietoja...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Päivitä kaikki</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Suorittaa valitun makron, jos asennettu</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Poistaa valitun makron tai työpöydän</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Asentaa tai päivittää valitun makron tai työpöydän</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Lataa ja käytä kaikkia saatavilla olevia päivityksiä</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Mukautetut repot (yksi riviä kohti):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Asettaa liitännäishallinnan asetukset</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Asetukset...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Liitännäishallinnan asetukset</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Poista valitut</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Asenna/päivitä valittu</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Sulje</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Jos tämä ominaisuus on valittuna ja kun käynnistät liittännäishallinnan,
-asennetut lisäosat tarkistetaan saatavilla oleville päivityksille
-(tämä vaatii, että järjestelmään on asennettuna GitPython-paketti)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Tarkista päivitykset automaattisesti alussa (vaatii GitPython: in)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Välityspalvelin </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Ei välityspalvelinta</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Käyttäjäjärjestelmän välityspalvelin</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Käyttäjän määrittämä välityspalvelin:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Lisäosien Hallinta</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Sulje lisäosien hallinta</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Voit käyttää tätä ikkunaa määrittääksesi ylimääräisiä lisätietovarastoja
-jotta ne voidaan skannata käytettävissä oleville lisäosille</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Kuvausta tälle makrolle ei voitu noutaa.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ jotta ne voidaan skannata käytettävissä oleville lisäosille</translation>
       <translation>Hallitse ulkoisia työpöytiä ja makroja</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Lisäosien Hallinta</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Työpöydät</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makrot</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Suorittaa valitun makron, jos asennettu</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Suorita</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Asettaa liitännäishallinnan asetukset</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Asetukset...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Ladataan tietoja...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Poistaa valitun makron tai työpöydän</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Poista valitut</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Asentaa tai päivittää valitun makron tai työpöydän</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Asenna/päivitä valittu</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Lataa ja käytä kaikkia saatavilla olevia päivityksiä</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Päivitä kaikki</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Sulje lisäosien hallinta</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Sulje</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Liitännäishallinnan asetukset</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Jos tämä ominaisuus on valittuna ja kun käynnistät liittännäishallinnan,
+asennetut lisäosat tarkistetaan saatavilla oleville päivityksille
+(tämä vaatii, että järjestelmään on asennettuna GitPython-paketti)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Tarkista päivitykset automaattisesti alussa (vaatii GitPython: in)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Mukautetut repot (yksi riviä kohti):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Voit käyttää tätä ikkunaa määrittääksesi ylimääräisiä lisätietovarastoja
+jotta ne voidaan skannata käytettävissä oleville lisäosille</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Välityspalvelin </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Ei välityspalvelinta</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Käyttäjäjärjestelmän välityspalvelin</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Käyttäjän määrittämä välityspalvelin:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_fil.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="fil" sourcelanguage="en">
+<TS version="2.1" language="fil" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation type="unfinished">Unable to fetch the code of this macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation type="unfinished">Unable to download addon list.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation type="unfinished">Unable to retrieve a description for this macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation type="unfinished">Workbenches list was updated.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation type="unfinished">Outdated GitPython detected, consider upgrading with pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation type="unfinished">List of macros successfully retrieved.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation type="unfinished">GitPython not installed! Cannot retrieve macros from git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation type="unfinished">Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation type="unfinished">Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation type="unfinished">Retrieving description...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation type="unfinished">Retrieving info from</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation type="unfinished">Raw markdown displayed</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation type="unfinished">Python Markdown library is missing.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation type="unfinished">An update is available for this addon.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation type="unfinished">This addon is already installed.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation type="unfinished">This addon is marked as obsolete</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation type="unfinished">This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation type="unfinished">This addon is marked as Python 2 Only</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation type="unfinished">This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation type="unfinished">Retrieving info from git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation type="unfinished">Retrieving info from wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation type="unfinished">This macro is already installed.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation type="unfinished">GitPython not found. Using standard download instead.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation type="unfinished">Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation type="unfinished">User requested updating a Python 2 workbench on a system running Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation type="unfinished">Workbench successfully updated. Please restart FreeCAD to apply the changes.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation type="unfinished">User requested installing a Python 2 workbench on a system running Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation type="unfinished">Workbench successfully installed. Please restart FreeCAD to apply the changes.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation type="unfinished">A macro has been installed and is available under Macro -&gt; Macros menu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation type="unfinished">Missing workbench</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation type="unfinished">Missing python module</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation type="unfinished">Missing optional python module (doesn&apos;t prevent installing)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation type="unfinished">Some errors were found that prevent to install this workbench</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation type="unfinished">Please install the missing components first.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation type="unfinished">Error: Unable to locate zip from</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation type="unfinished">Error: Unable to download</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation type="unfinished">Successfully installed</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation type="unfinished">Addon manager</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation type="unfinished">You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation type="unfinished">No update available</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation type="unfinished">Installed</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation type="unfinished">Macro could not be removed.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation type="unfinished">Unable to download addon list.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation type="unfinished">Workbenches list was updated.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation type="unfinished">Outdated GitPython detected, consider upgrading with pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation type="unfinished">List of macros successfully retrieved.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation type="unfinished">Retrieving description...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation type="unfinished">Retrieving info from</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation type="unfinished">An update is available for this addon.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation type="unfinished">This addon is already installed.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation type="unfinished">Retrieving info from git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation type="unfinished">Retrieving info from wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation type="unfinished">GitPython not found. Using standard download instead.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation type="unfinished">Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation type="unfinished">Workbench successfully installed. Please restart FreeCAD to apply the changes.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation type="unfinished">Missing workbench</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation type="unfinished">Missing python module</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation type="unfinished">Missing optional python module (doesn&apos;t prevent installing)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation type="unfinished">Some errors were found that prevent to install this workbench</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation type="unfinished">Please install the missing components first.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation type="unfinished">Error: Unable to download</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation type="unfinished">Successfully installed</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation type="unfinished">GitPython not installed! Cannot retrieve macros from git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation type="unfinished">Installed</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation type="unfinished">Restart required</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation type="unfinished">This macro is already installed.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation type="unfinished">Unable to fetch the code of this macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation type="unfinished">A macro has been installed and is available under Macro -&gt; Macros menu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation type="unfinished">This addon is marked as obsolete</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation type="unfinished">This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation type="unfinished">Error: Unable to locate zip from</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation type="unfinished">Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation type="unfinished">This addon is marked as Python 2 Only</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation type="unfinished">This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation type="unfinished">User requested updating a Python 2 workbench on a system running Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation type="unfinished">Workbench successfully updated. Please restart FreeCAD to apply the changes.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation type="unfinished">User requested installing a Python 2 workbench on a system running Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation type="unfinished">Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation type="unfinished">Raw markdown displayed</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation type="unfinished">Python Markdown library is missing.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Mga workbench</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Mga Macro</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Ipatupad</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation type="unfinished">Downloading info...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation type="unfinished">Update all</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation type="unfinished">Executes the selected macro, if installed</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation type="unfinished">Uninstalls a selected macro or workbench</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation type="unfinished">Installs or updates the selected macro or workbench</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation type="unfinished">Download and apply all available updates</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation type="unfinished">Custom repositories (one per line):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation type="unfinished">Sets configuration options for the Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation type="unfinished">Configure...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation type="unfinished">Addon manager options</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation type="unfinished">Uninstall selected</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation type="unfinished">Install/update selected</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Sarado</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation type="unfinished">If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation type="unfinished">Automatically check for updates at start (requires GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation type="unfinished">Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation type="unfinished">No proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation type="unfinished">User system proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation type="unfinished">User defined proxy :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation type="unfinished">Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation type="unfinished">Close the Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation type="unfinished">You can use this window to specify additional addon repositories
-to be scanned for available addons</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation type="unfinished">Unable to retrieve a description for this macro.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ to be scanned for available addons</translation>
       <translation type="unfinished">Manage external workbenches and macros</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation type="unfinished">Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Mga workbench</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Mga Macro</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation type="unfinished">Executes the selected macro, if installed</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Ipatupad</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation type="unfinished">Sets configuration options for the Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation type="unfinished">Configure...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation type="unfinished">Downloading info...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation type="unfinished">Uninstalls a selected macro or workbench</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation type="unfinished">Uninstall selected</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation type="unfinished">Installs or updates the selected macro or workbench</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation type="unfinished">Install/update selected</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation type="unfinished">Download and apply all available updates</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation type="unfinished">Update all</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation type="unfinished">Close the Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Sarado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation type="unfinished">Addon manager options</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation type="unfinished">If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation type="unfinished">Automatically check for updates at start (requires GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation type="unfinished">Custom repositories (one per line):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation type="unfinished">You can use this window to specify additional addon repositories
+to be scanned for available addons</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation type="unfinished">Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation type="unfinished">No proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation type="unfinished">User system proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation type="unfinished">User defined proxy :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_fr.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="fr" sourcelanguage="en">
+<TS version="2.1" language="fr" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Impossible de récupérer le code de cette macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Impossible de télécharger la liste des greffons.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Impossible de retrouver la description de cette macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>La liste des ateliers a été mise à jour.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>La version de GitPython est obsolète, envisagez de mettre à jour avec pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Liste des macros récupérée avec succès.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython n'est pas installé. Impossible de récupérer les macros depuis git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Une erreur s'est produite lors de la Récupération de Macro Git, peut-être que l'exécutable Git n'est pas dans le chemin d'accès</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Il semble y avoir un problème de connexion au Wiki, la liste des macros du Wiki ne peut donc pas être récupérée pour le moment</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Récupération de la description...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Récupération des informations de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Affichage du Markdown brut</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>La bibliothèque Python Markdown est manquante.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Une mise à jour est disponible pour ce greffon.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Ce greffon est déjà installé.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Ce greffon est marqué comme obsolète</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Cela signifie généralement qu'il n'est plus maintenu, et que d'autres greffons plus perfectionnés proposant les mêmes fonctionnalités sont disponibles.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Cet addon est indiqué pour Python 2 uniquement</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Cet atelier peut ne plus être maintenu et l'installer sur un système Python 3 entraînera très probablement des erreurs au démarrage ou en cours d'utilisation.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Récupération des informations depuis git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Récupération des informations depuis le wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Cette macro est déjà installée.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython est introuvable. Utilisation du téléchargement standard.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Votre version de Python semble ne pas supporter les fichiers ZIP. Impossible de continuer.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>L'utilisateur a demandé la mise à jour d'un atelier Python 2 sur un système Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Atelier mis à jour avec succès. Veuillez redémarrer FreeCAD pour appliquer les modifications.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>L'utilisateur a demandé l'installation d'un atelier Python 2 sur un système exécutant Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Atelier installé avec succès. Veuillez redémarrer FreeCAD pour appliquer les modifications.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Une macro a été installée et est disponible dans le menu Macro -&gt; Macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Atelier manquant</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Module Python manquant</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Un module Python optionnel est manquant (mais n'empêche pas l'installation)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Des erreurs sont survenues et empêchent l'installation de cet atelier</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Veuillez d'abord installer les composants manquants.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Erreur: Impossible de localiser le zip de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Erreur : impossible de télécharger</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Installation réussie</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Gestionnaire de Greffons</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Vous devez redémarrer FreeCAD pour que les changements prennent effet. Appuyez sur Ok pour redémarrer FreeCAD maintenant, ou Annuler pour redémarrer plus tard.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Aucune mise à jour disponible</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Installé</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>La macro n'a pas pu être désinstallée.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Impossible de télécharger la liste des greffons.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>La liste des ateliers a été mise à jour.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>La version de GitPython est obsolète, envisagez de mettre à jour avec pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Liste des macros récupérée avec succès.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Récupération de la description...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Récupération des informations de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Une mise à jour est disponible pour ce greffon.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Ce greffon est déjà installé.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Récupération des informations depuis git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Récupération des informations depuis le wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython est introuvable. Utilisation du téléchargement standard.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Votre version de Python semble ne pas supporter les fichiers ZIP. Impossible de continuer.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Atelier installé avec succès. Veuillez redémarrer FreeCAD pour appliquer les modifications.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Atelier manquant</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Module Python manquant</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Un module Python optionnel est manquant (mais n'empêche pas l'installation)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Des erreurs sont survenues et empêchent l'installation de cet atelier</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Veuillez d'abord installer les composants manquants.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Erreur : impossible de télécharger</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Installation réussie</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython n'est pas installé. Impossible de récupérer les macros depuis git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Installé</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,207 +282,14 @@
       <translation>Redémarrage requis</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Cette macro est déjà installée.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Impossible de récupérer le code de cette macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Une macro a été installée et est disponible dans le menu Macro -&gt; Macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Ce greffon est marqué comme obsolète</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Cela signifie généralement qu'il n'est plus maintenu, et que d'autres greffons plus perfectionnés proposant les mêmes fonctionnalités sont disponibles.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Erreur: Impossible de localiser le zip de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Une erreur s'est produite lors de la Récupération de Macro Git, peut-être que l'exécutable Git n'est pas dans le chemin d'accès</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Cet addon est indiqué pour Python 2 uniquement</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Cet atelier peut ne plus être maintenu et l'installer sur un système Python 3 entraînera très probablement des erreurs au démarrage ou en cours d'utilisation.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>L'utilisateur a demandé la mise à jour d'un atelier Python 2 sur un système Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Atelier mis à jour avec succès. Veuillez redémarrer FreeCAD pour appliquer les modifications.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>L'utilisateur a demandé l'installation d'un atelier Python 2 sur un système exécutant Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Il semble y avoir un problème de connexion au Wiki, la liste des macros du Wiki ne peut donc pas être récupérée pour le moment</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Affichage du Markdown brut</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>La bibliothèque Python Markdown est manquante.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Ateliers</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macros</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Lancer</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Téléchargement des informations...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Tout mettre à jour</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Exécuter la macro sélectionnée, si elle est installée</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Désinstalle une macro ou un atelier sélectionné</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Installe ou met à jour la macro ou l'atelier sélectionnés</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Télécharger et installer toutes les mises à jour disponibles</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Dépôts personnalisés (un par ligne) :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Définit les options de configuration pour le gestionnaire d'addon</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configurer...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Options du gestionnaire d'addon</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Désinstaller la sélection</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Installer/mettre à jour la sélection</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Fermer</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Si cette option est cochée, lors du lancement du gestionnaire de greffons,
-les mises à jour disponibles des greffons installés seront vérifiées
-(cela nécessite l'installation du paquet GitPython sur votre système)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Vérifier automatiquement les mises à jour au démarrage (nécessite GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Relai </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Aucun relai</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Relai de système utilisateur</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Relai défini par l'utilisateur :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Gestionnaire d'extensions</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Fermer le Gestionnaire d'Addon</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Vous pouvez utiliser cette fenêtre pour spécifier des répertoires d'addon complémentaires à analyser pour les addons disponibles</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Impossible de retrouver la description de cette macro.</translation>
     </message>
   </context>
   <context>
@@ -423,4 +305,137 @@ to be scanned for available addons</source>
       <translation>Gérer les ateliers et macros externes</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Gestionnaire d'extensions</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Ateliers</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macros</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Exécuter la macro sélectionnée, si elle est installée</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Lancer</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Définit les options de configuration pour le gestionnaire d'addon</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configurer...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Téléchargement des informations...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Désinstalle une macro ou un atelier sélectionné</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Désinstaller la sélection</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Installe ou met à jour la macro ou l'atelier sélectionnés</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Installer/mettre à jour la sélection</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Télécharger et installer toutes les mises à jour disponibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Tout mettre à jour</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Fermer le Gestionnaire d'Addon</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Fermer</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Options du gestionnaire d'addon</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Si cette option est cochée, lors du lancement du gestionnaire de greffons,
+les mises à jour disponibles des greffons installés seront vérifiées
+(cela nécessite l'installation du paquet GitPython sur votre système)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Vérifier automatiquement les mises à jour au démarrage (nécessite GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Dépôts personnalisés (un par ligne) :</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Vous pouvez utiliser cette fenêtre pour spécifier des répertoires d'addon complémentaires à analyser pour les addons disponibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Relai </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Aucun relai</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Relai de système utilisateur</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Relai défini par l'utilisateur :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_gl.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="gl" sourcelanguage="en">
+<TS version="2.1" language="gl" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Imposible recuperar o código desta macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Non se pode descargar a lista de complementos.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Imposible recuperar a descrición para esta macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>A lista de bancos de traballo foi actualizada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Detectado GitPython caducado, considera actualizar con pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Lista de macros recuperada con éxito.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPyton non instalado! Non se pode recuperar macros dende o git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Algo saíu mal coa recuperación de macros de Git, posiblemente o executable de Git non está na ruta</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Parece que hai un problema ó conectarse á Wiki, polo tanto non se pode recuperar a lista de macros da Wiki neste momento</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Recuperando descrición...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Recuperando información dende</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Mostrando Markdown sen procesar</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Falta a biblioteca Markdown de Python.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Unha actualización está dispoñible para este engadido.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Este engadido xa está instalado.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Este complemento está marcado como obsoleto</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Esto xeralmente significa que xa non é mantido, e algún complemento máis avanzado nesta lista provén a mesma funcionalidade.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Este complemento está marcado soamente como Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Este banco de traballo xa non se mantén e instalalo nun sistema con Python 3 probablemente provoque erros ó iniciarse ou ó usarse.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Recuperando información dende git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Recuperando información dende wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Esta macro xa está instalada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython non atopado. Utilizando descarga estándard no seu lugar.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>A túa versión de python non parece ser compatible con ficheiros ZIP. Non é posible proceder.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>O usuario solicitou actualizar un banco de traballo en Python 2 nun sistema que executa Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>O banco de traballo actualizouse correctamente. Reinicie FreeCAD para aplicar os cambios.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>O usuario solicitou instalar un banco de traballo en Python 2 nun sistema que executa Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>O banco de traballo instalado correctamente. Fai o favor de reiniciar FreeCAD para aplicar os trocos.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Unha macro foi instalada e está dispoñible baixo o menú Macros Macro -&gt;</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Perdido banco de traballo</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Perdido módulo python</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Módulo python opcional perdido (non impide a instalación)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Algúns erros atopados que impiden instalar este banco de traballo</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Fai o favor de instalar os compoñentes que falta primeiro.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Erro: non se puido localizar o zip dende</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Erro: A descarga non vai</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Instalado con éxito</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Xestor de complementos</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Tes que reiniciar FreeCAD para que os trocos teñan efecto. Preme Ok para reiniciar FreeCAD agora, ou Cancelar para reiniciar despois.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Sen actualización dispoñible</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Instalado</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Non se puido eliminar a macro.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Non se pode descargar a lista de complementos.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>A lista de bancos de traballo foi actualizada.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Detectado GitPython caducado, considera actualizar con pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Lista de macros recuperada con éxito.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Recuperando descrición...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Recuperando información dende</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Unha actualización está dispoñible para este engadido.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Este engadido xa está instalado.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Recuperando información dende git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Recuperando información dende wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython non atopado. Utilizando descarga estándard no seu lugar.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>A túa versión de python non parece ser compatible con ficheiros ZIP. Non é posible proceder.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>O banco de traballo instalado correctamente. Fai o favor de reiniciar FreeCAD para aplicar os trocos.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Perdido banco de traballo</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Perdido módulo python</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Módulo python opcional perdido (non impide a instalación)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Algúns erros atopados que impiden instalar este banco de traballo</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Fai o favor de instalar os compoñentes que falta primeiro.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Erro: A descarga non vai</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Instalado con éxito</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPyton non instalado! Non se pode recuperar macros dende o git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Instalado</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Require reinicio</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Esta macro xa está instalada.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Imposible recuperar o código desta macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Unha macro foi instalada e está dispoñible baixo o menú Macros Macro -&gt;</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Este complemento está marcado como obsoleto</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Esto xeralmente significa que xa non é mantido, e algún complemento máis avanzado nesta lista provén a mesma funcionalidade.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Erro: non se puido localizar o zip dende</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Algo saíu mal coa recuperación de macros de Git, posiblemente o executable de Git non está na ruta</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Este complemento está marcado soamente como Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Este banco de traballo xa non se mantén e instalalo nun sistema con Python 3 probablemente provoque erros ó iniciarse ou ó usarse.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>O usuario solicitou actualizar un banco de traballo en Python 2 nun sistema que executa Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>O banco de traballo actualizouse correctamente. Reinicie FreeCAD para aplicar os cambios.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>O usuario solicitou instalar un banco de traballo en Python 2 nun sistema que executa Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Parece que hai un problema ó conectarse á Wiki, polo tanto non se pode recuperar a lista de macros da Wiki neste momento</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Mostrando Markdown sen procesar</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Falta a biblioteca Markdown de Python.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Bancos de traballo</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macros</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Executar</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Descargando información...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Actualizar todo</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Executa a macro escolmada, se está instalada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Desinstala unha macro escolmada ou banco de traballo</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instalar ou actualizar a macro escolmada ou banco de traballo</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Descargar e aplicar tódalas actualizacións dispoñibles</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repositorios persoais (un por liña):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Conxunto de opcións de configuración para o Xestor de Engadidos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configurar...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opcións do xestor de engadidos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Desinstalar escolmado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instalar/actualizar escolmado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Pechar</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Se selecciona esta opción, cando inicie o Xestor de complementos,
-revisaranse os complementos instalados en busca de actualizacións
-(isto require que teña instalado o paquete GitPython no seu sistema)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Comprobar automaticamente actualizacións ó inicio (require GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Sen proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Proxy do sistema de usuario</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy definido polo usuario:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Xestor de complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Pechar o Xestor de complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Podes usar esta xanela para especificar repositorios adicionais de complementos
-que se escanearán para ver os complementos dispoñibles</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Imposible recuperar a descrición para esta macro.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ que se escanearán para ver os complementos dispoñibles</translation>
       <translation>Xestionar bancos de traballo externos e macros</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Xestor de complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Bancos de traballo</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macros</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Executa a macro escolmada, se está instalada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Executar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Conxunto de opcións de configuración para o Xestor de Engadidos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configurar...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Descargando información...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Desinstala unha macro escolmada ou banco de traballo</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Desinstalar escolmado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instalar ou actualizar a macro escolmada ou banco de traballo</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instalar/actualizar escolmado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Descargar e aplicar tódalas actualizacións dispoñibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Actualizar todo</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Pechar o Xestor de complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Pechar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opcións do xestor de engadidos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Se selecciona esta opción, cando inicie o Xestor de complementos,
+revisaranse os complementos instalados en busca de actualizacións
+(isto require que teña instalado o paquete GitPython no seu sistema)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Comprobar automaticamente actualizacións ó inicio (require GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repositorios persoais (un por liña):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Podes usar esta xanela para especificar repositorios adicionais de complementos
+que se escanearán para ver os complementos dispoñibles</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Sen proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Proxy do sistema de usuario</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy definido polo usuario:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_hr.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="hr" sourcelanguage="en">
+<TS version="2.1" language="hr" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,185 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Neuspijeli pokušaj dohvaćanja koda ove makro naredbe.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Nije moguće preuzeti popis dodataka.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Neuspijeli pokušaj dohvaćanja opisa ove makro naredbe.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Popis radnih površina je ažuriran.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Otkriven je zastarjeli GitPython, razmislite o nadogradnji s pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Popis makronaredbi uspješno je dohvaćen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython se nije instalirao! Ne mogu se dohvatiti makronaredbe iz git-a</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Nešto je pošlo po zlu s dohvaćanjem Git Macro-a, možda Git izvršni program nije u poveznici</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Čini se da je problem povezivanje s Wiki-em, stoga trenutačno ne može dohvatiti popis makronaredbi Wiki-a</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Dohvaćanje opisa...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Dohvaćanje informacije od</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Prikazan čisti markdown kod</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Nedostaje Python Markdown biblioteka.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Dostupno ažuriranje za ovaj dodatak.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Ovaj dodatak je već instaliran.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Ovaj dodatak je označen kao zastario</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>To obično znači da se više ne održava, a neki napredniji dodatak na ovom popisu pruža istu funkciju.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Taj je dodatak označen samo za Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Ova radna ploča se više ne može održavati i instaliranje na Python 3 sustav  vjerojatno će rezultirati pogreškama pri pokretanju ili tijekom upotrebe.
+
+</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Dohvaćanje informacije od git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Dohvaćanje informacije od wiki-a</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Ova makronaredba je već instalirana.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython nije pronađen. Upotreba standardnog preuzimanja.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Vaša verzija python-a ne podržava ZIP datoteke. Nije moguće nastaviti.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Korisnik je zatražio ažuriranje radne površine Python 2 na sustavu koji pokreće Python 3 -</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Workbench je uspješno ažuriran. Ponovo pokrenite FreeCAD da biste primijenili promjene.
+
+</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Korisnik je zatražio instaliranje radne stanice Python 2 na sustav koji radi s Python 3 -
+
+</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Radna površina je uspješno instalirana. Ponovo pokrenite FreeCAD da biste primijenili promjene.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Makronaredba je instalirana i dostupna je pod Makro -&gt; Makros-Izborniku</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Nedostaje radna površina</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Nedostaje python modul</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Nedostaje neobvezan python modul (neće se spriječiti instalacija)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Pronađene su neke pogreške koje sprečavaju instalaciju ove radne površine</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Prvo instalirajte nedostajuće dijelove.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Greška: Nije moguće locirati zip od</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Greška: Ne mogu preuzeti</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Uspješno instaliran</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +202,26 @@
       <source>Addon manager</source>
       <translation>Upravitelj dodataka</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Morate ponovo pokrenuti FreeCAD da bi promjene stupile na snagu. Pritisnite OK za ponovno pokretanje programa FreeCAD sada ili Odustani za kasnije ponovno pokretanje.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +242,11 @@
       <source>No update available</source>
       <translation>Nema dostupnih ažuriranja</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Instalirano</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +277,6 @@
       <source>Macro could not be removed.</source>
       <translation>Nije moguće ukloniti Makro.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Nije moguće preuzeti popis dodataka.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Popis radnih površina je ažuriran.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Otkriven je zastarjeli GitPython, razmislite o nadogradnji s pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Popis makronaredbi uspješno je dohvaćen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Dohvaćanje opisa...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Dohvaćanje informacije od</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Dostupno ažuriranje za ovaj dodatak.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Ovaj dodatak je već instaliran.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Dohvaćanje informacije od git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Dohvaćanje informacije od wiki-a</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython nije pronađen. Upotreba standardnog preuzimanja.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Vaša verzija python-a ne podržava ZIP datoteke. Nije moguće nastaviti.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Radna površina je uspješno instalirana. Ponovo pokrenite FreeCAD da biste primijenili promjene.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Nedostaje radna površina</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Nedostaje python modul</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Nedostaje neobvezan python modul (neće se spriječiti instalacija)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Pronađene su neke pogreške koje sprečavaju instalaciju ove radne površine</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Prvo instalirajte nedostajuće dijelove.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Greška: Ne mogu preuzeti</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Uspješno instaliran</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython se nije instalirao! Ne mogu se dohvatiti makronaredbe iz git-a</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Instalirano</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,214 +288,14 @@
       <translation>Potrebno je ponovo pokretanje</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Ova makronaredba je već instalirana.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Neuspijeli pokušaj dohvaćanja koda ove makro naredbe.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Makronaredba je instalirana i dostupna je pod Makro -&gt; Makros-Izborniku</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Ovaj dodatak je označen kao zastario</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>To obično znači da se više ne održava, a neki napredniji dodatak na ovom popisu pruža istu funkciju.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Greška: Nije moguće locirati zip od</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Nešto je pošlo po zlu s dohvaćanjem Git Macro-a, možda Git izvršni program nije u poveznici</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Taj je dodatak označen samo za Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Ova radna ploča se više ne može održavati i instaliranje na Python 3 sustav  vjerojatno će rezultirati pogreškama pri pokretanju ili tijekom upotrebe.
-
-</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Korisnik je zatražio ažuriranje radne površine Python 2 na sustavu koji pokreće Python 3 -</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Workbench je uspješno ažuriran. Ponovo pokrenite FreeCAD da biste primijenili promjene.
-
-</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Korisnik je zatražio instaliranje radne stanice Python 2 na sustav koji radi s Python 3 -
-
-</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Čini se da je problem povezivanje s Wiki-em, stoga trenutačno ne može dohvatiti popis makronaredbi Wiki-a</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Prikazan čisti markdown kod</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Nedostaje Python Markdown biblioteka.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Radne površine</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makronaredbe</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Izvršiti</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Preuzimanje informacija...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Ažuriraj sve</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Izvodi odabranu makronaredbu, ako je instalirana</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Deinstaliraj označenu makronaredbu ili radnu površinu</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instaliraj ili ažuriraj odabranu makronaredbu ili radnu površinu</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Preuzmite i primijenite sva dostupna ažuriranja</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Prilagođeni repozitorij (jedan po retku):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Postavlja opcije postavki za Upravljač dodataka</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Podesi...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opcije uređivača dodataka</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Deinstaliraj označeno</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instaliraj/ažuriraj odabrano</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Zatvori</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Ako je odabrana ta mogućnost, pri pokretanju Upravitelja dodataka,
-instalirani dodaci će se provjeriti na dostupna ažuriranja
-(za ovo je potreban paket GitPython instaliran na vašem sustavu)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Automatski provjeri ima li ažuriranaj prilikom pokretanja(zahtijeva GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>No proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>User system proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Korisnički definiran proxy :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Upravitelj dodataka</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Zatvori Upravitelja dodataka</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Možete koristiti ovaj prozor da biste odredili dodatna spremišta dodataka
-kako bi se skenirali svi dostupni dodaci</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Neuspijeli pokušaj dohvaćanja opisa ove makro naredbe.</translation>
     </message>
   </context>
   <context>
@@ -430,4 +311,138 @@ kako bi se skenirali svi dostupni dodaci</translation>
       <translation>Upravljanje sa vanjskim radnim površinama i makronaredbama</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Upravitelj dodataka</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Radne površine</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makronaredbe</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Izvodi odabranu makronaredbu, ako je instalirana</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Izvršiti</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Postavlja opcije postavki za Upravljač dodataka</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Podesi...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Preuzimanje informacija...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Deinstaliraj označenu makronaredbu ili radnu površinu</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Deinstaliraj označeno</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instaliraj ili ažuriraj odabranu makronaredbu ili radnu površinu</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instaliraj/ažuriraj odabrano</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Preuzmite i primijenite sva dostupna ažuriranja</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Ažuriraj sve</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Zatvori Upravitelja dodataka</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Zatvori</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opcije uređivača dodataka</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Ako je odabrana ta mogućnost, pri pokretanju Upravitelja dodataka,
+instalirani dodaci će se provjeriti na dostupna ažuriranja
+(za ovo je potreban paket GitPython instaliran na vašem sustavu)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Automatski provjeri ima li ažuriranaj prilikom pokretanja(zahtijeva GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Prilagođeni repozitorij (jedan po retku):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Možete koristiti ovaj prozor da biste odredili dodatna spremišta dodataka
+kako bi se skenirali svi dostupni dodaci</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>No proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>User system proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Korisnički definiran proxy :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_hu.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="hu" sourcelanguage="en">
+<TS version="2.1" language="hu" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Nem sikerült beolvasni a makró kódját.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>A kiegészítő letöltése sikertelen.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Nem olvasható be a makró leírása.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>A munkafelületek listája frissítve.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Elavult GitPython észlelve, fontolja meg a frissítés a pip-el.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>A sikeresen beolvasott makrók listája.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython nincs telepítve! Nem olvashatók be a makrók a git-ből</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Valami elromlott a Git makró visszakeresésnél, esetleg a futtatható Git nincs az elérési úton</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Úgy tűnik, hogy a wikihez való kapcsolódási probléma, ezért jelenleg nem lehet beolvasni a Wiki makrólistát</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Leírások lekérdezése...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Információ beolvasása ettől</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Nyers leíró megjelenítése</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Python leíró könyvtár hiányzik.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Ehhez a kiegészítőhöz egy frissítés érhető el.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Ez a kiegészítő már telepítve van.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Ez a bővítmény elavultként jelölt</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Ez általában azt jelenti, hogy már nem tartják karban, és a lista néhány fejlettebb bővítménye ugyanazokat a funkciókat nyújtja.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Ez a bővítmény csak Python 2-ként van megjelölve</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Előfordulhat, hogy ez a munkafelület már nem karbantartható, és a Python 3 rendszerre való telepítése több mint valószínű, hogy hibákat fog eredményezni indításkor vagy használat közben.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Információ beolvasása git-ből</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Információ beolvasása wiki-ből</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Ez a makró már telepítve van.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython nem található. Szokásos letöltési hely használata.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>A Python verziója úgy tűnik, nem támogatja a zip fájlokat. Nem folytatható.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>A felhasználó egy Python 2 munkaterület frissítését kérte egy Python 3-at futtató rendszeren - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>A munkaterület frissítése sikeresen megtörtént. A módosítások alkalmazásához indítsa újra a FreeCAD programot.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>A felhasználó python 2 munkafelület telepítését kérte egy Python 3-at futtató rendszeren - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Munkafelület sikeresen telepítve. A változtatások alkalmazásához indítsa újra a FreeCAD programot.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>A makró telepítve van, és elérhető a Makró -&gt; Makrók menüben</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Hiányzó munkafelület</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Hiányzó python modul</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Hiányzó kiegészítő python modul (nem állítja meg a telepítése)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Néhány hibát talált, amely megakadályozza, hogy telepítse ezt a munkafelületet</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Kérem először telepítse a hiányzó összetevőket.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Hiba: Nem található a zip formátum</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Hiba: Nem lehet letölteni</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Sikeresen telepítve</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Kiegészítők kezelője</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>A módosítások érvénybe léptetéséhez újra kell indítania a FreeCAD programot. A FreeCAD újraindításához nyomja meg az Ok gombot, vagy a Mégse gombra indítsa újra később.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Nem érhető el frissítés</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Telepítve</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Makró eltávolítása sikertelen.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>A kiegészítő letöltése sikertelen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>A munkafelületek listája frissítve.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Elavult GitPython észlelve, fontolja meg a frissítés a pip-el.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>A sikeresen beolvasott makrók listája.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Leírások lekérdezése...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Információ beolvasása ettől</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Ehhez a kiegészítőhöz egy frissítés érhető el.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Ez a kiegészítő már telepítve van.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Információ beolvasása git-ből</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Információ beolvasása wiki-ből</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython nem található. Szokásos letöltési hely használata.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>A Python verziója úgy tűnik, nem támogatja a zip fájlokat. Nem folytatható.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Munkafelület sikeresen telepítve. A változtatások alkalmazásához indítsa újra a FreeCAD programot.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Hiányzó munkafelület</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Hiányzó python modul</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Hiányzó kiegészítő python modul (nem állítja meg a telepítése)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Néhány hibát talált, amely megakadályozza, hogy telepítse ezt a munkafelületet</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Kérem először telepítse a hiányzó összetevőket.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Hiba: Nem lehet letölteni</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Sikeresen telepítve</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython nincs telepítve! Nem olvashatók be a makrók a git-ből</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Telepítve</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Újraindítás szükséges</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Ez a makró már telepítve van.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Nem sikerült beolvasni a makró kódját.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>A makró telepítve van, és elérhető a Makró -&gt; Makrók menüben</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Ez a bővítmény elavultként jelölt</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Ez általában azt jelenti, hogy már nem tartják karban, és a lista néhány fejlettebb bővítménye ugyanazokat a funkciókat nyújtja.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Hiba: Nem található a zip formátum</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Valami elromlott a Git makró visszakeresésnél, esetleg a futtatható Git nincs az elérési úton</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Ez a bővítmény csak Python 2-ként van megjelölve</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Előfordulhat, hogy ez a munkafelület már nem karbantartható, és a Python 3 rendszerre való telepítése több mint valószínű, hogy hibákat fog eredményezni indításkor vagy használat közben.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>A felhasználó egy Python 2 munkaterület frissítését kérte egy Python 3-at futtató rendszeren - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>A munkaterület frissítése sikeresen megtörtént. A módosítások alkalmazásához indítsa újra a FreeCAD programot.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>A felhasználó python 2 munkafelület telepítését kérte egy Python 3-at futtató rendszeren - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Úgy tűnik, hogy a wikihez való kapcsolódási probléma, ezért jelenleg nem lehet beolvasni a Wiki makrólistát</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Nyers leíró megjelenítése</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Python leíró könyvtár hiányzik.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Munkafelületek</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makrók</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Végrehajtás</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Letöltési infó...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Összes frissítése</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>A kijelölt makró végrehajtása, ha telepítve van</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Kijelölt makró vagy munkafelület eltávolítása</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>A kijelölt makró vagy munkafelület telepítése vagy frissítése</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Az összes elérhető frissítés letöltése és alkalmazása</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Egyéni tárolók (soronként egy):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>A bővítmény-kezelő konfigurációs beállításainak megadása</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Konfigurálás...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Bővítmény kezelő beállítások</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Kijelöltek eltávolítása</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Kijelöltek telepítése/frissítése</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Bezárás</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Ha ez a beállítás bejelölt, a "Kiegészítők kezelője" indításakor a
-telepített bővítményeket a rendszer ellenőrzi az elérhető frissítésekre
-(ehhez a rendszerre telepített GitPython csomagra van szükség)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Automatikusan nézze meg a frissítéseket az indításkor (gitpython szükséges)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Nincs proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Felhasználói rendszer proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Felhasználó által meghatározott proxy:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Kiegészítők kezelője</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Kiegészítők kezelőjének bezárása</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Ebben az ablakban további kiegészítő tárolókat adhat meg
-a rendelkezésre álló bővítmények beolvasásához</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Nem olvasható be a makró leírása.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ a rendelkezésre álló bővítmények beolvasásához</translation>
       <translation>Külső munkafelületek és makrók kezelése</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Kiegészítők kezelője</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Munkafelületek</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makrók</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>A kijelölt makró végrehajtása, ha telepítve van</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Végrehajtás</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>A bővítmény-kezelő konfigurációs beállításainak megadása</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Konfigurálás...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Letöltési infó...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Kijelölt makró vagy munkafelület eltávolítása</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Kijelöltek eltávolítása</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>A kijelölt makró vagy munkafelület telepítése vagy frissítése</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Kijelöltek telepítése/frissítése</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Az összes elérhető frissítés letöltése és alkalmazása</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Összes frissítése</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Kiegészítők kezelőjének bezárása</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Bezárás</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Bővítmény kezelő beállítások</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Ha ez a beállítás bejelölt, a "Kiegészítők kezelője" indításakor a
+telepített bővítményeket a rendszer ellenőrzi az elérhető frissítésekre
+(ehhez a rendszerre telepített GitPython csomagra van szükség)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Automatikusan nézze meg a frissítéseket az indításkor (gitpython szükséges)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Egyéni tárolók (soronként egy):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Ebben az ablakban további kiegészítő tárolókat adhat meg
+a rendelkezésre álló bővítmények beolvasásához</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Nincs proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Felhasználói rendszer proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Felhasználó által meghatározott proxy:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_id.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="id" sourcelanguage="en">
+<TS version="2.1" language="id" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Tidak dapat mengambil kode makro ini.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Tidak dapat mengunduh daftar addon.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Tidak dapat mengambil deskripsi untuk makro ini.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Daftar meja kerja sudah diperbarui.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>GitPython yang kedaluwarsa terdeteksi, pertimbangkan untuk meningkatkan dengan pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Daftar makro berhasil diambil.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython tidak diinstal! Tidak dapat mengambil makro dari git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation type="unfinished">Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation type="unfinished">Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Mengambil deskripsi...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Mengambil info dari</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation type="unfinished">Raw markdown displayed</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation type="unfinished">Python Markdown library is missing.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Pembaruan tersedia untuk addon ini.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Addon ini sudah diinstal.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Addon ini ditandai sebagai usang</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Addon ini biasanya tidak lagi dipertahankan dan beberapa addon lebih canggih di daftar ini menyediakan fungsionalitas yang sama.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation type="unfinished">This addon is marked as Python 2 Only</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Meja kerja ini tidak lagi diurus dan memasangnya pada sistem Python 3 mungkin akan lebih sering menyebabkan galat saat memulai atau saat menggunakan.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Mengambil info dari git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Mengambil info dari wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Makro ini sudah diinstal.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython tidak ditemukan. Sebaliknya, gunakan unduhan standar.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Versi python Anda tampaknya tidak mendukung file ZIP. Tidak dapat melanjutkan.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Pengguna minta memperbaharui meja kerja Python 2 di sistem yang menjalankan Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Meja kerja berhasil diperbaharui. Tolong mulai ulang FreeCAD untuk menerapkan perubahan.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation type="unfinished">User requested installing a Python 2 workbench on a system running Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Meja kerja berhasil diinstal. Silakan mulai kembali FreeCAD untuk menerapkan perubahan.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Sebuah makro sudah diinstal dan tersedia di bawah menu Makro -&gt; Makro</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Meja kerja tidak ada</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Modul python tidak ada</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Modul python opsional tidak ada (tidak mencegah penginstalan)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Beberapa kesalahan ditemukan yang mencegah untuk menginstal meja kerja ini</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Silakan instal komponen yang hilang terlebih dahulu.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Kesalahan: Tidak dapat menemukan zip dari</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Kesalahan: Tidak dapat mengunduh</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Berhasil diinstal</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Manajer addon</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Anda harus memulai ulang FreeCAD agar perubahan diterapkan. Tekan OK untuk memulai kembali FreeCAD sekarang atau Batal untuk memulai kembali nanti.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Tidak ada pembaruan yang tersedia</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Telah diinstal</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Makro tidak dapat dihapus.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Tidak dapat mengunduh daftar addon.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Daftar meja kerja sudah diperbarui.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>GitPython yang kedaluwarsa terdeteksi, pertimbangkan untuk meningkatkan dengan pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Daftar makro berhasil diambil.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Mengambil deskripsi...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Mengambil info dari</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Pembaruan tersedia untuk addon ini.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Addon ini sudah diinstal.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Mengambil info dari git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Mengambil info dari wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython tidak ditemukan. Sebaliknya, gunakan unduhan standar.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Versi python Anda tampaknya tidak mendukung file ZIP. Tidak dapat melanjutkan.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Meja kerja berhasil diinstal. Silakan mulai kembali FreeCAD untuk menerapkan perubahan.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Meja kerja tidak ada</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Modul python tidak ada</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Modul python opsional tidak ada (tidak mencegah penginstalan)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Beberapa kesalahan ditemukan yang mencegah untuk menginstal meja kerja ini</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Silakan instal komponen yang hilang terlebih dahulu.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Kesalahan: Tidak dapat mengunduh</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Berhasil diinstal</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython tidak diinstal! Tidak dapat mengambil makro dari git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Telah diinstal</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Mulai ulang diperlukan</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Makro ini sudah diinstal.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Tidak dapat mengambil kode makro ini.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Sebuah makro sudah diinstal dan tersedia di bawah menu Makro -&gt; Makro</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Addon ini ditandai sebagai usang</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Addon ini biasanya tidak lagi dipertahankan dan beberapa addon lebih canggih di daftar ini menyediakan fungsionalitas yang sama.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Kesalahan: Tidak dapat menemukan zip dari</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation type="unfinished">Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation type="unfinished">This addon is marked as Python 2 Only</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Meja kerja ini tidak lagi diurus dan memasangnya pada sistem Python 3 mungkin akan lebih sering menyebabkan galat saat memulai atau saat menggunakan.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Pengguna minta memperbaharui meja kerja Python 2 di sistem yang menjalankan Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Meja kerja berhasil diperbaharui. Tolong mulai ulang FreeCAD untuk menerapkan perubahan.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation type="unfinished">User requested installing a Python 2 workbench on a system running Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation type="unfinished">Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation type="unfinished">Raw markdown displayed</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation type="unfinished">Python Markdown library is missing.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Workbenches</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makro</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Menjalankan</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Mengunduh info...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Perbarui semua</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Menjalankan makro yang dipilih, jika diinstal</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Menghapus instalasi makro atau meja kerja yang dipilih</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Menginstal atau memperbarui makro atau meja kerja yang dipilih</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Unduh dan terapkan semua pembaruan yang tersedia</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Ruang penyimpanan khusus (satu per baris):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Menetapkan opsi konfigurasi untuk Manajer Addon</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Mengonfigurasikan...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opsi addon manajer</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Hapus instalasi yang dipilih</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instal/perbarui yang dipilih</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Dekat</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Jika opsi ini dipilih, saat meluncurkan Manajer Addon,
-addon yang terinstal akan diperiksa untuk pembaruan yang tersedia
-(ini membutuhkan paket GitPython yang diinstal di sistem Anda)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Secara otomatis memeriksa pembaruan di awal (memerlukan GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Tanpa proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Proxy sistem pengguna</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy yang ditentukan pengguna:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation type="unfinished">Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation type="unfinished">Close the Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation type="unfinished">You can use this window to specify additional addon repositories
-to be scanned for available addons</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Tidak dapat mengambil deskripsi untuk makro ini.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ to be scanned for available addons</translation>
       <translation>Kelola meja kerja dan makro eksternal</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation type="unfinished">Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Workbenches</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makro</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Menjalankan makro yang dipilih, jika diinstal</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Menjalankan</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Menetapkan opsi konfigurasi untuk Manajer Addon</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Mengonfigurasikan...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Mengunduh info...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Menghapus instalasi makro atau meja kerja yang dipilih</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Hapus instalasi yang dipilih</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Menginstal atau memperbarui makro atau meja kerja yang dipilih</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instal/perbarui yang dipilih</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Unduh dan terapkan semua pembaruan yang tersedia</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Perbarui semua</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation type="unfinished">Close the Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Dekat</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opsi addon manajer</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Jika opsi ini dipilih, saat meluncurkan Manajer Addon,
+addon yang terinstal akan diperiksa untuk pembaruan yang tersedia
+(ini membutuhkan paket GitPython yang diinstal di sistem Anda)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Secara otomatis memeriksa pembaruan di awal (memerlukan GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Ruang penyimpanan khusus (satu per baris):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation type="unfinished">You can use this window to specify additional addon repositories
+to be scanned for available addons</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Tanpa proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Proxy sistem pengguna</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy yang ditentukan pengguna:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_it.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="it" sourcelanguage="en">
+<TS version="2.1" language="it" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Impossibile recuperare il codice di questa macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Impossibile scaricare la lista degli addon.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Impossibile recuperare una descrizione per questa macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Elenco degli ambienti di lavoro aggiornato.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Rilevato GitPython obsoleto, considerare di aggiornarlo con pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Lista delle macro recuperata con successo.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython non installato! Impossibile recuperare la macro da git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Qualcosa è andato storto con il recupero della macro da Git, forse l'eseguibile Git non è nel percorso</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Sembra esserci un problema di connessione al Wiki, quindi in questo momento non è possibile recuperare l'elenco delle macro</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Recupero descrizione...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Recupero informazioni da</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Visualizza il sorgente Markdown</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Manca la libreria Python Markdown.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Per questo addon è disponibile un aggiornamento.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Questo addon è già installato.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Questo addon è contrassegnato come obsoleto</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Questo di solito significa che non è più mantenuto e alcuni addon in questa lista forniscono la stessa funzionalità.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Questo componente aggiuntivo è contrassegnato come solo con Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Questo ambiente potrebbe non essere più mantenuto e installarlo su un sistema Python 3 causerà probabilmente errori all'avvio o durante l'uso.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Recupero informazioni da git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Recupero informazioni dal wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Questa macro è già installata.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython non trovato. In sostituzione, usare il download standard.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Sembra che la versione di python non supporti i file ZIP. Impossibile procedere.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>L'utente ha richiesto l'aggiornamento di un ambiente di lavoro in Python 2 su un sistema che esegue Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Ambiente di lavoro aggiornato correttamente. Riavviare FreeCAD per applicare le modifiche.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>L'utente ha richiesto l'installazione di un ambiente di lavoro in Python 2 su un sistema che esegue Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Ambiente di lavoro installato correttamente. Riavviare FreeCAD per applicare le modifiche.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Una macro è stata installata ed è disponibile sotto Macro -&gt; menu Macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Ambiente di lavoro mancante</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Modulo python mancante</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Modulo Python opzionale mancante (ma non impedisce l'installazione)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Sono stati trovati alcuni errori che impediscono di installare questo ambiente di lavoro</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Si prega di installare prima i componenti mancanti.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Errore: Impossibile individuare zip da</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Errore: download impossibile</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Installazione riuscita</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Addon manager</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Per rendere effettive le modifiche è necessario riavviare FreeCAD. Premere Ok per riavviare FreeCAD ora, o Annulla per riavviare più tardi.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Nessun aggiornamento disponibile</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Installato</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Impossibile rimuovere la macro.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Impossibile scaricare la lista degli addon.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Elenco degli ambienti di lavoro aggiornato.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Rilevato GitPython obsoleto, considerare di aggiornarlo con pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Lista delle macro recuperata con successo.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Recupero descrizione...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Recupero informazioni da</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Per questo addon è disponibile un aggiornamento.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Questo addon è già installato.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Recupero informazioni da git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Recupero informazioni dal wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython non trovato. In sostituzione, usare il download standard.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Sembra che la versione di python non supporti i file ZIP. Impossibile procedere.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Ambiente di lavoro installato correttamente. Riavviare FreeCAD per applicare le modifiche.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Ambiente di lavoro mancante</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Modulo python mancante</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Modulo Python opzionale mancante (ma non impedisce l'installazione)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Sono stati trovati alcuni errori che impediscono di installare questo ambiente di lavoro</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Si prega di installare prima i componenti mancanti.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Errore: download impossibile</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Installazione riuscita</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython non installato! Impossibile recuperare la macro da git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Installato</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Riavvio richiesto</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Questa macro è già installata.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Impossibile recuperare il codice di questa macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Una macro è stata installata ed è disponibile sotto Macro -&gt; menu Macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Questo addon è contrassegnato come obsoleto</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Questo di solito significa che non è più mantenuto e alcuni addon in questa lista forniscono la stessa funzionalità.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Errore: Impossibile individuare zip da</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Qualcosa è andato storto con il recupero della macro da Git, forse l'eseguibile Git non è nel percorso</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Questo componente aggiuntivo è contrassegnato come solo con Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Questo ambiente potrebbe non essere più mantenuto e installarlo su un sistema Python 3 causerà probabilmente errori all'avvio o durante l'uso.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>L'utente ha richiesto l'aggiornamento di un ambiente di lavoro in Python 2 su un sistema che esegue Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Ambiente di lavoro aggiornato correttamente. Riavviare FreeCAD per applicare le modifiche.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>L'utente ha richiesto l'installazione di un ambiente di lavoro in Python 2 su un sistema che esegue Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Sembra esserci un problema di connessione al Wiki, quindi in questo momento non è possibile recuperare l'elenco delle macro</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Visualizza il sorgente Markdown</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Manca la libreria Python Markdown.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Ambienti di lavoro</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macro</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Esegui</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Download informazioni...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Aggiorna tutto</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Esegue la macro selezionata, se installata</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Disinstalla un ambiente di lavoro o una macro selezionata</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Installa o aggiorna l'ambiente di lavoro selezionato</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Scarica e applica tutti gli aggiornamenti disponibili</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repository personalizzati (uno per riga):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Imposta le opzioni di configurazione per Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configura...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opzioni di Addon manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Disinstalla selezionati</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Installa/aggiorna selezionati</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Chiudi</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Se questa opzione è selezionata, quando si avvia Addon Manager,
-gli addons installati verranno controllati per gli aggiornamenti disponibili
-(questo richiede che il pacchetto GitPython sia installato sul sistema)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Controlla automaticamente gli aggiornamenti all'avvio (richiede GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>No proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Usa il proxy di rete del sistema</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy definito dall'utente :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Addon manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Chiude Addon manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>È possibile utilizzare questa finestra per specificare ulteriori repository di addon
-da scansionare per gli addon disponibili</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Impossibile recuperare una descrizione per questa macro.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ da scansionare per gli addon disponibili</translation>
       <translation>Gestisce gli ambienti di lavoro e le macro esterne</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Addon manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Ambienti di lavoro</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macro</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Esegue la macro selezionata, se installata</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Esegui</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Imposta le opzioni di configurazione per Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configura...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Download informazioni...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Disinstalla un ambiente di lavoro o una macro selezionata</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Disinstalla selezionati</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Installa o aggiorna l'ambiente di lavoro selezionato</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Installa/aggiorna selezionati</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Scarica e applica tutti gli aggiornamenti disponibili</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Aggiorna tutto</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Chiude Addon manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Chiudi</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opzioni di Addon manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Se questa opzione è selezionata, quando si avvia Addon Manager,
+gli addons installati verranno controllati per gli aggiornamenti disponibili
+(questo richiede che il pacchetto GitPython sia installato sul sistema)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Controlla automaticamente gli aggiornamenti all'avvio (richiede GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repository personalizzati (uno per riga):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>È possibile utilizzare questa finestra per specificare ulteriori repository di addon
+da scansionare per gli addon disponibili</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>No proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Usa il proxy di rete del sistema</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy definito dall'utente :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_ja.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="ja" sourcelanguage="en">
+<TS version="2.1" language="ja" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>このマクロのコードがフェッチできません。</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>アドオンの一覧をダウンロードできませんでした。</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>このマクロについての説明を受信することができません。</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>ワークベンチの一覧を更新しました。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>古い GitPython が見つかりました。pip によるアップグレードを検討してください。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>マクロの一覧を取り込むことに成功しました。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPythonがインストールされていませんでした！よってマクロをgitより取り戻すことができません</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Git マクロの取得に問題が発生しました。おそらく Git 実行ファイルがパス中にありません。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Wikiへの接続で問題が発生したため、現時点ではWikiのマクロリストを取得できません。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>説明の取り込み中</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>情報を取り込み中</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>未加工のマークダウンを表示</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Python Markdown ライブラリがありません。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>このアドオンでアップデートが利用可能です。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>このアドオンは既にインストールされています。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>このアドオンは非推奨に設定されています</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>通常はすでにメンテナンスがされていないことを意味します。このリストにあるさらに高度なアドオンが同じ機能を提供している場合があります。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>このアドオンは Python 2 専用として記されています</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>このワークベンチは保守されておらず、Python 3 システムにインストールすると起動時や使用中にエラーが発生する可能性が高くなります。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Gitからの情報を取り込み中</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Wikiからの情報を取得しています</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>このマクロは既にインストールされています。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPythonが見つかりません。代わりに標準のダウンロードを使用しています。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>利用しているPythonのバージョンではZIPファイルをサポートしていないようです。ゆえに続行できません。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>ユーザーが Python 3 を実行しているシステムで Python 2 用ワークベンチの更新を要求しました - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>ワークベンチの更新が成功しました。 FreeCADを再起動して変更を有効にしてください。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>ユーザーが Python 3 を実行しているシステムで Python 2 用ワークベンチのインストールを要求しました - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>ワークベンチのインストールが成功しました。 FreeCADを再起動して変更を有効にしてください。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>マクロがインストールされました。メニューのマクロ -&gt; マクロから利用できます。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>ワークベンチが見当たりません</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Pythonが見当たりません</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>オプションのPythonモジュールが見つかりません(インストールは停止されません)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>エラーが発生したためこのワークベンチをインストールすることができません</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>先ずは、見当たらないコンポーネントをインストールしてください。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>エラー: ZIP ファイルを以下から配置できません。</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>エラー: ダウンロードできませんでした</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>インストールが完了しました</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>アドオンマネージャー</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>変更を反映するにはFreeCADを再起動する必要があります。今すぐFreeCADを再起動する場合はOKを、後で再起動する場合はキャンセルを押してください。</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>利用可能なアップデートはありません</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>インストール済み</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>マクロを削除できませんでした</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>アドオンの一覧をダウンロードできませんでした。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>ワークベンチの一覧を更新しました。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>古い GitPython が見つかりました。pip によるアップグレードを検討してください。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>マクロの一覧を取り込むことに成功しました。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>説明の取り込み中</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>情報を取り込み中</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>このアドオンでアップデートが利用可能です。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>このアドオンは既にインストールされています。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Gitからの情報を取り込み中</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Wikiからの情報を取得しています</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPythonが見つかりません。代わりに標準のダウンロードを使用しています。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>利用しているPythonのバージョンではZIPファイルをサポートしていないようです。ゆえに続行できません。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>ワークベンチのインストールが成功しました。 FreeCADを再起動して変更を有効にしてください。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>ワークベンチが見当たりません</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Pythonが見当たりません</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>オプションのPythonモジュールが見つかりません(インストールは停止されません)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>エラーが発生したためこのワークベンチをインストールすることができません</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>先ずは、見当たらないコンポーネントをインストールしてください。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>エラー: ダウンロードできませんでした</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>インストールが完了しました</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPythonがインストールされていませんでした！よってマクロをgitより取り戻すことができません</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>インストール済み</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,205 +282,14 @@
       <translation>再起動が必要です</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>このマクロは既にインストールされています。</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>このマクロのコードがフェッチできません。</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>マクロがインストールされました。メニューのマクロ -&gt; マクロから利用できます。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>このアドオンは非推奨に設定されています</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>通常はすでにメンテナンスがされていないことを意味します。このリストにあるさらに高度なアドオンが同じ機能を提供している場合があります。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>エラー: ZIP ファイルを以下から配置できません。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Git マクロの取得に問題が発生しました。おそらく Git 実行ファイルがパス中にありません。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>このアドオンは Python 2 専用として記されています</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>このワークベンチは保守されておらず、Python 3 システムにインストールすると起動時や使用中にエラーが発生する可能性が高くなります。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>ユーザーが Python 3 を実行しているシステムで Python 2 用ワークベンチの更新を要求しました - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>ワークベンチの更新が成功しました。 FreeCADを再起動して変更を有効にしてください。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>ユーザーが Python 3 を実行しているシステムで Python 2 用ワークベンチのインストールを要求しました - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Wikiへの接続で問題が発生したため、現時点ではWikiのマクロリストを取得できません。</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>未加工のマークダウンを表示</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Python Markdown ライブラリがありません。</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>ワークベンチ</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>マクロ</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>実行</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>ダウンロード情報....</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>すべて更新</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>インストールされている場合、選択したマクロを実行</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>選択したマクロ、ワークベンチをアンインストール</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>選択したマクロ、ワークベンチをインストールまたは更新</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>利用可能な全てのアップデートをダウンロードして適用する</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>カスタム・レポジトリー（1行に1つ）:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>アドオン・マネージャーの構成オプションを設定</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>設定...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>アドオン・マネージャーのオプション</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>選択したものをアンインストール</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>選択したものをインストール/更新</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>閉じる</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>このオプションが選択されている場合、アドオン・マネージャーの起動時にインストールされているアドオンに利用可能な更新があるかがチェックされます（システムにGitPythonパッケージがインストールされている必要があります）</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>開始時に更新を自動確認 （GitPython が必要）</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>プロキシ </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>プロキシを使用しない</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>ユーザーシステムプロキシ</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>ユーザー定義プロキシ:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>アドオン・マネージャー</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>アドオン・マネージャーを閉じる</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>このウィンドウを使用して、利用可能なアドオンをスキャンさせる追加のアドオン・レポジトリーを指定できます</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>このマクロについての説明を受信することができません。</translation>
     </message>
   </context>
   <context>
@@ -421,4 +305,135 @@ to be scanned for available addons</source>
       <translation>外部のワークベンチとマクロを管理</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>アドオン・マネージャー</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>ワークベンチ</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>マクロ</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>インストールされている場合、選択したマクロを実行</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>実行</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>アドオン・マネージャーの構成オプションを設定</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>設定...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>ダウンロード情報....</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>選択したマクロ、ワークベンチをアンインストール</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>選択したものをアンインストール</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>選択したマクロ、ワークベンチをインストールまたは更新</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>選択したものをインストール/更新</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>利用可能な全てのアップデートをダウンロードして適用する</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>すべて更新</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>アドオン・マネージャーを閉じる</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>閉じる</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>アドオン・マネージャーのオプション</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>このオプションが選択されている場合、アドオン・マネージャーの起動時にインストールされているアドオンに利用可能な更新があるかがチェックされます（システムにGitPythonパッケージがインストールされている必要があります）</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>開始時に更新を自動確認 （GitPython が必要）</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>カスタム・レポジトリー（1行に1つ）:</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>このウィンドウを使用して、利用可能なアドオンをスキャンさせる追加のアドオン・レポジトリーを指定できます</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>プロキシ </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>プロキシを使用しない</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>ユーザーシステムプロキシ</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>ユーザー定義プロキシ:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_lt.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="lt" sourcelanguage="en">
+<TS version="2.1" language="lt" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation type="unfinished">Unable to fetch the code of this macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation type="unfinished">Unable to download addon list.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation type="unfinished">Unable to retrieve a description for this macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation type="unfinished">Workbenches list was updated.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation type="unfinished">Outdated GitPython detected, consider upgrading with pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation type="unfinished">List of macros successfully retrieved.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation type="unfinished">GitPython not installed! Cannot retrieve macros from git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation type="unfinished">Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation type="unfinished">Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation type="unfinished">Retrieving description...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation type="unfinished">Retrieving info from</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation type="unfinished">Raw markdown displayed</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation type="unfinished">Python Markdown library is missing.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation type="unfinished">An update is available for this addon.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation type="unfinished">This addon is already installed.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation type="unfinished">This addon is marked as obsolete</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation type="unfinished">This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation type="unfinished">This addon is marked as Python 2 Only</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation type="unfinished">This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation type="unfinished">Retrieving info from git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation type="unfinished">Retrieving info from wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation type="unfinished">This macro is already installed.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation type="unfinished">GitPython not found. Using standard download instead.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation type="unfinished">Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation type="unfinished">User requested updating a Python 2 workbench on a system running Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation type="unfinished">Workbench successfully updated. Please restart FreeCAD to apply the changes.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation type="unfinished">User requested installing a Python 2 workbench on a system running Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation type="unfinished">Workbench successfully installed. Please restart FreeCAD to apply the changes.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation type="unfinished">A macro has been installed and is available under Macro -&gt; Macros menu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation type="unfinished">Missing workbench</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation type="unfinished">Missing python module</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation type="unfinished">Missing optional python module (doesn&apos;t prevent installing)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation type="unfinished">Some errors were found that prevent to install this workbench</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation type="unfinished">Please install the missing components first.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation type="unfinished">Error: Unable to locate zip from</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation type="unfinished">Error: Unable to download</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation type="unfinished">Successfully installed</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation type="unfinished">Addon manager</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation type="unfinished">You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation type="unfinished">No update available</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation type="unfinished">Installed</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation type="unfinished">Macro could not be removed.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation type="unfinished">Unable to download addon list.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation type="unfinished">Workbenches list was updated.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation type="unfinished">Outdated GitPython detected, consider upgrading with pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation type="unfinished">List of macros successfully retrieved.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation type="unfinished">Retrieving description...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation type="unfinished">Retrieving info from</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation type="unfinished">An update is available for this addon.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation type="unfinished">This addon is already installed.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation type="unfinished">Retrieving info from git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation type="unfinished">Retrieving info from wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation type="unfinished">GitPython not found. Using standard download instead.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation type="unfinished">Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation type="unfinished">Workbench successfully installed. Please restart FreeCAD to apply the changes.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation type="unfinished">Missing workbench</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation type="unfinished">Missing python module</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation type="unfinished">Missing optional python module (doesn&apos;t prevent installing)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation type="unfinished">Some errors were found that prevent to install this workbench</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation type="unfinished">Please install the missing components first.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation type="unfinished">Error: Unable to download</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation type="unfinished">Successfully installed</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation type="unfinished">GitPython not installed! Cannot retrieve macros from git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation type="unfinished">Installed</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Būtina paleisti iš naujo</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation type="unfinished">This macro is already installed.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation type="unfinished">Unable to fetch the code of this macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation type="unfinished">A macro has been installed and is available under Macro -&gt; Macros menu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation type="unfinished">This addon is marked as obsolete</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation type="unfinished">This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation type="unfinished">Error: Unable to locate zip from</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation type="unfinished">Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation type="unfinished">This addon is marked as Python 2 Only</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation type="unfinished">This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation type="unfinished">User requested updating a Python 2 workbench on a system running Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation type="unfinished">Workbench successfully updated. Please restart FreeCAD to apply the changes.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation type="unfinished">User requested installing a Python 2 workbench on a system running Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation type="unfinished">Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation type="unfinished">Raw markdown displayed</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation type="unfinished">Python Markdown library is missing.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Darbastaliai</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makrokomandos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Vykdyti</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation type="unfinished">Downloading info...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation type="unfinished">Update all</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation type="unfinished">Executes the selected macro, if installed</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation type="unfinished">Uninstalls a selected macro or workbench</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation type="unfinished">Installs or updates the selected macro or workbench</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation type="unfinished">Download and apply all available updates</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation type="unfinished">Custom repositories (one per line):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation type="unfinished">Sets configuration options for the Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation type="unfinished">Configure...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation type="unfinished">Addon manager options</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation type="unfinished">Uninstall selected</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation type="unfinished">Install/update selected</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Užverti</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation type="unfinished">If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation type="unfinished">Automatically check for updates at start (requires GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation type="unfinished">Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation type="unfinished">No proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation type="unfinished">User system proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation type="unfinished">User defined proxy :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation type="unfinished">Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation type="unfinished">Close the Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation type="unfinished">You can use this window to specify additional addon repositories
-to be scanned for available addons</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation type="unfinished">Unable to retrieve a description for this macro.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ to be scanned for available addons</translation>
       <translation type="unfinished">Manage external workbenches and macros</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation type="unfinished">Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Darbastaliai</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makrokomandos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation type="unfinished">Executes the selected macro, if installed</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Vykdyti</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation type="unfinished">Sets configuration options for the Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation type="unfinished">Configure...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation type="unfinished">Downloading info...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation type="unfinished">Uninstalls a selected macro or workbench</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation type="unfinished">Uninstall selected</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation type="unfinished">Installs or updates the selected macro or workbench</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation type="unfinished">Install/update selected</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation type="unfinished">Download and apply all available updates</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation type="unfinished">Update all</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation type="unfinished">Close the Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Užverti</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation type="unfinished">Addon manager options</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation type="unfinished">If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation type="unfinished">Automatically check for updates at start (requires GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation type="unfinished">Custom repositories (one per line):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation type="unfinished">You can use this window to specify additional addon repositories
+to be scanned for available addons</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation type="unfinished">Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation type="unfinished">No proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation type="unfinished">User system proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation type="unfinished">User defined proxy :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_nl.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="nl" sourcelanguage="en">
+<TS version="2.1" language="nl" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>De code van de macro kan niet worden opgehaald.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Addon lijst kan niet worden opgehaald.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>De beschrijving van deze macro kan niet worden opgehaald.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Werkbankenlijst is bijgewerkt.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Verouderde GitPython gevonden, overweeg een upgrade met pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Lijst van macro's succesvol opgehaald.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython niet geïnstalleerd! Macro's kunnen niet worden opgehaald van git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Er is iets misgegaan met het ophalen van de Git Macro. Mogelijk bevindt het uitvoerbare Git-bestand zich niet in het pad</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Er lijkt een probleem te zijn met de verbinding met de Wiki, daarom kan de Wiki-macrolijst op dit moment niet worden opgehaald</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Omschrijving ophalen...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Informatie ophalen vanaf</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Ongeformateerde tekst weergegeven</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Python Markdown bibliotheek mist.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Er is een update beschikbaar voor deze addon.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Deze addon is al geïnstalleerd.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Deze uitbreiding is gemarkeerd als verouderd</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Dit betekent gewoonlijk dat het niet meer onderhouden wordt, en een geavanceerdere uitbreidingen in deze lijst biedt dezelfde functionaliteit.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Deze toevoeging is alleen geschikt voor Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Deze werkbank wordt wellicht niet langer onderhouden en de installatie ervan op een Python 3-systeem zal hoogstwaarschijnlijk leiden tot fouten bij het opstarten of tijdens het gebruik.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Informatie ophalen van git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Informatie ophalen van wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Deze macro is al geïnstalleerd.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython niet gevonden. Standaard download wordt nu gebruikt.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Je versie van Python lijkt geen ZIP-bestanden te ondersteunen. Verder gaan niet mogelijk.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>De gebruiker verzocht om een Python 2 werkbank bij te werken die alleen geschikt is voor Python 3 </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Werkbank succesvol bijgewerkt. Herstart FreeCAD om de wijzigingen toe te passen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>De gebruiker verzocht om een Python 2 werkbank te installeren op een systeem dat Python 3 draait </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Werkbank succesvol geïnstalleerd. Herstart FreeCAD om de wijzigingen toe te passen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Een macro is geïnstalleerd en is beschikbaar onder Macro -&gt; Macro' s menu</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Werkbank ontbreekt</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Ontbrekende python module</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Ontbrekende optionele python module (voorkomt niet het installeren)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Er zijn enkele fouten gevonden die voorkomen dat deze werkbank wordt geïnstalleerd</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Installeer eerst de ontbrekende componenten.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Fout: Kan zip niet vinden vanuit</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Fout: Kan niet downloaden</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Succesvol geïnstalleerd</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Uitbreidingsmanager</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Je moet FreeCAD opnieuw starten om de wijzigingen door te voeren. Klik Ok om FreeCAD nu opnieuw te starten, of Cancel om dit later te doen.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Geen update beschikbaar</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Geïnstalleerd</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Macro kon niet worden verwijderd.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Addon lijst kan niet worden opgehaald.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Werkbankenlijst is bijgewerkt.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Verouderde GitPython gevonden, overweeg een upgrade met pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Lijst van macro's succesvol opgehaald.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Omschrijving ophalen...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Informatie ophalen vanaf</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Er is een update beschikbaar voor deze addon.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Deze addon is al geïnstalleerd.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Informatie ophalen van git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Informatie ophalen van wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython niet gevonden. Standaard download wordt nu gebruikt.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Je versie van Python lijkt geen ZIP-bestanden te ondersteunen. Verder gaan niet mogelijk.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Werkbank succesvol geïnstalleerd. Herstart FreeCAD om de wijzigingen toe te passen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Werkbank ontbreekt</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Ontbrekende python module</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Ontbrekende optionele python module (voorkomt niet het installeren)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Er zijn enkele fouten gevonden die voorkomen dat deze werkbank wordt geïnstalleerd</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Installeer eerst de ontbrekende componenten.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Fout: Kan niet downloaden</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Succesvol geïnstalleerd</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython niet geïnstalleerd! Macro's kunnen niet worden opgehaald van git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Geïnstalleerd</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Opnieuw opstarten vereist</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Deze macro is al geïnstalleerd.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>De code van de macro kan niet worden opgehaald.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Een macro is geïnstalleerd en is beschikbaar onder Macro -&gt; Macro' s menu</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Deze uitbreiding is gemarkeerd als verouderd</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Dit betekent gewoonlijk dat het niet meer onderhouden wordt, en een geavanceerdere uitbreidingen in deze lijst biedt dezelfde functionaliteit.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Fout: Kan zip niet vinden vanuit</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Er is iets misgegaan met het ophalen van de Git Macro. Mogelijk bevindt het uitvoerbare Git-bestand zich niet in het pad</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Deze toevoeging is alleen geschikt voor Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Deze werkbank wordt wellicht niet langer onderhouden en de installatie ervan op een Python 3-systeem zal hoogstwaarschijnlijk leiden tot fouten bij het opstarten of tijdens het gebruik.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>De gebruiker verzocht om een Python 2 werkbank bij te werken die alleen geschikt is voor Python 3 </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Werkbank succesvol bijgewerkt. Herstart FreeCAD om de wijzigingen toe te passen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>De gebruiker verzocht om een Python 2 werkbank te installeren op een systeem dat Python 3 draait </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Er lijkt een probleem te zijn met de verbinding met de Wiki, daarom kan de Wiki-macrolijst op dit moment niet worden opgehaald</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Ongeformateerde tekst weergegeven</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Python Markdown bibliotheek mist.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Werkbanken</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macro's</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Uitvoeren</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Info downloaden...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Alles bijwerken</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Voert de geselecteerde macro uit, indien geïnstalleerd</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Verwijder een geselecteerde macro of werkbank</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Installeert of de geselecteerde macro of werkbank, of werkt deze bij</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Download en pas alle beschikbare updates toe</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Aangepaste opslagplaatsen (één per lijn):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Stelt de configuratieopties voor de uitbreidingsmanager in</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configureer...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opties voor de uitbreidingsmanager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Verwijder geselecteerde</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Geselecteerde installeren/bijwerken</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Sluiten</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Als deze optie geselecteerd is, zullen bij het starten van de uitbreidingsmanager 
-geïnstalleerde uitbreidingen gecontroleerd worden op beschikbare updates 
-(dit vereist het GitPython-pakket dat op uw systeem geïnstalleerd is)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Controleer automatisch op updates bij het opstarten (vereist GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Geen proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Proxy van gebruikerssysteem</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Gebruikergedefinieerde proxy :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Uitbreidingsmanager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Sluit uitbreidingsmanager</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>U kunt dit venster gebruiken om extra add-on-opslagplaatsen op te geven
-die gescand moeten worden voor beschikbare add-ons</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>De beschrijving van deze macro kan niet worden opgehaald.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ die gescand moeten worden voor beschikbare add-ons</translation>
       <translation>Externe werkbanken en macro's beheren</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Uitbreidingsmanager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Werkbanken</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macro's</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Voert de geselecteerde macro uit, indien geïnstalleerd</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Uitvoeren</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Stelt de configuratieopties voor de uitbreidingsmanager in</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configureer...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Info downloaden...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Verwijder een geselecteerde macro of werkbank</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Verwijder geselecteerde</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Installeert of de geselecteerde macro of werkbank, of werkt deze bij</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Geselecteerde installeren/bijwerken</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Download en pas alle beschikbare updates toe</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Alles bijwerken</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Sluit uitbreidingsmanager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Sluiten</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opties voor de uitbreidingsmanager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Als deze optie geselecteerd is, zullen bij het starten van de uitbreidingsmanager 
+geïnstalleerde uitbreidingen gecontroleerd worden op beschikbare updates 
+(dit vereist het GitPython-pakket dat op uw systeem geïnstalleerd is)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Controleer automatisch op updates bij het opstarten (vereist GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Aangepaste opslagplaatsen (één per lijn):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>U kunt dit venster gebruiken om extra add-on-opslagplaatsen op te geven
+die gescand moeten worden voor beschikbare add-ons</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Geen proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Proxy van gebruikerssysteem</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Gebruikergedefinieerde proxy :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_pl.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="pl" sourcelanguage="en">
+<TS version="2.1" language="pl" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Nie można pobrać kodu makrodefinicji.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Nie można pobrać listy dodatków.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Nie można pobrać opisu makrodefinicji.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Lista Środowisk pracy została zaktualizowana.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Wykryto przestarzały GitPython, rozważ aktualizację za pomocą programu pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Pomyślnie pobrano listę makrodefinicji.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython nie jest zainstalowany! Nie można pobrać makrodefinicji z git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Coś poszło nie tak z pobieraniem makr Git, prawdopodobnie plik wykonywalny Git nie występuje w podanej lokalizacjii</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Wygląda na to, że występuje problem z połączeniem się z Wiki, dlatego nie można obecnie pobrać listy makrodefinicji dostępnej na Wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Pobieranie opisu...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Pobieranie informacji z</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Wyświetlono surowy format markdown</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Brakuje biblioteki Markdown środowiska Python.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Aktualizacja jest dostępna dla tego dodatku.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Ten dodatek jest już zainstalowany.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Ten dodatek jest oznaczony jako przestarzały</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Oznacza to, że zazwyczaj nie jest on już utrzymywany, a niektóre bardziej zaawansowane dodatki z tej listy zapewniają tę samą funkcjonalność.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Ten dodatek jest oznaczony tylko jako Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Te środowisko pracy nie może być dłużej utrzymywane, a zainstalowanie go w systemie Python 3 z dużym prawdopodobieństwem doprowadzi do błędów podczas uruchamiania lub podczas użytkowania.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Pobieranie informacji z git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Pobieranie informacji z Wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Moduł jest już zainstalowany.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>Nie znaleziono GitPython. Zamiast tego użyto standardowego pobierania.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Twoja wersja Pythona nie&apos; obsługuje plików ZIP. Nie można kontynuować.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Użytkownik poprosił o zaktualizowanie Środowiska pracy Python 2 w systemie z obsługą Pythona 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Środowisko pracy zaktualizowano pomyślnie. Uruchom ponownie FreeCAD, aby zastosować zmiany.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Użytkownik poprosił o zainstalowanie Środowiska pracy Python 2 w systemie z obsługą Pythona 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Środowisko pracy zainstalowano pomyślnie. Uruchom ponownie FreeCAD, aby zastosować zmiany.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Makro zostało zainstalowane i jest dostępne w menu Macrodefinicji -&gt; Menu makrodefinicji</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Nieistniejące Środowisko pracy</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Nieistniejący moduł Pyton</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Brakuje opcjonalnego modułu Python (nie przeszkadza w instalacji)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Znaleziono pewne błędy, które uniemożliwiają zainstalowanie tego środowiska</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Proszę najpierw zainstalować brakujące komponenty.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Błąd: nie można znaleźć pliku Zip z</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Błąd: Nie można pobrać</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Zainstalowano pomyślnie</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Menedżer dodatków</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Musisz zrestartować program FreeCAD, aby zmiany odniosły skutek. Naciśnij Ok, aby zrestartować FreeCAD teraz, lub Anuluj, aby zrestartować program później.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Brak dostępnych aktualizacji</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Zainstalowano</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Nie można usunąć makra.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Nie można pobrać listy dodatków.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Lista Środowisk pracy została zaktualizowana.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Wykryto przestarzały GitPython, rozważ aktualizację za pomocą programu pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Pomyślnie pobrano listę makrodefinicji.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Pobieranie opisu...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Pobieranie informacji z</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Aktualizacja jest dostępna dla tego dodatku.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Ten dodatek jest już zainstalowany.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Pobieranie informacji z git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Pobieranie informacji z Wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>Nie znaleziono GitPython. Zamiast tego użyto standardowego pobierania.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Twoja wersja Pythona nie&apos; obsługuje plików ZIP. Nie można kontynuować.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Środowisko pracy zainstalowano pomyślnie. Uruchom ponownie FreeCAD, aby zastosować zmiany.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Nieistniejące Środowisko pracy</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Nieistniejący moduł Pyton</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Brakuje opcjonalnego modułu Python (nie przeszkadza w instalacji)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Znaleziono pewne błędy, które uniemożliwiają zainstalowanie tego środowiska</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Proszę najpierw zainstalować brakujące komponenty.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Błąd: Nie można pobrać</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Zainstalowano pomyślnie</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython nie jest zainstalowany! Nie można pobrać makrodefinicji z git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Zainstalowano</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,209 +282,14 @@
       <translation>Wymagany restart</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Moduł jest już zainstalowany.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Nie można pobrać kodu makrodefinicji.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Makro zostało zainstalowane i jest dostępne w menu Macrodefinicji -&gt; Menu makrodefinicji</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Ten dodatek jest oznaczony jako przestarzały</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Oznacza to, że zazwyczaj nie jest on już utrzymywany, a niektóre bardziej zaawansowane dodatki z tej listy zapewniają tę samą funkcjonalność.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Błąd: nie można znaleźć pliku Zip z</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Coś poszło nie tak z pobieraniem makr Git, prawdopodobnie plik wykonywalny Git nie występuje w podanej lokalizacjii</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Ten dodatek jest oznaczony tylko jako Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Te środowisko pracy nie może być dłużej utrzymywane, a zainstalowanie go w systemie Python 3 z dużym prawdopodobieństwem doprowadzi do błędów podczas uruchamiania lub podczas użytkowania.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Użytkownik poprosił o zaktualizowanie Środowiska pracy Python 2 w systemie z obsługą Pythona 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Środowisko pracy zaktualizowano pomyślnie. Uruchom ponownie FreeCAD, aby zastosować zmiany.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Użytkownik poprosił o zainstalowanie Środowiska pracy Python 2 w systemie z obsługą Pythona 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Wygląda na to, że występuje problem z połączeniem się z Wiki, dlatego nie można obecnie pobrać listy makrodefinicji dostępnej na Wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Wyświetlono surowy format markdown</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Brakuje biblioteki Markdown środowiska Python.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Środowiska
-    pracy</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makrodefinicje</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Wykonaj</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Pobieranie informacji...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Aktualizuj wszystko</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Rozpoczyna wykonywanie wybranego makra, jeśli jest zainstalowane</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Odinstalowuje wybrane makrodefinicje lub środowisko pracy</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instaluje lub aktualizuje wybrane makrodefinicje lub środowisko pracy</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Pobierz i zainstaluj wszystkie dostępne aktualizacje</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repozytoria użytkownika (jedno na linię):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Ustawia opcje konfiguracji dla Menedżera dodatków</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Konfiguruj...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opcje menedżera dodatków</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Odinstaluj wybrane</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Zainstaluj / zaktualizuj wybrane</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Zamknij</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Jeśli ta opcja jest zaznaczona, podczas uruchamiania Menedżera Dodatków,
-zainstalowane dodatki zostaną sprawdzone pod kątem dostępnych aktualizacji
-(wymaga to zainstalowanego pakietu GitPython w systemie)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Automatycznie sprawdzaj aktualizacje podczas uruchomienia (wymaga GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Brak proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Proxy systemu użytkownika</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy zdefiniowane przez użytkownika:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Menedżer dodatków</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Zamknij Menedżera dodatków</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Możesz użyć tego okna, aby określić dodatkowe repozytoria dodatków które
-zostaną użyte w poszukiwaniu dostępnych dodatków</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Nie można pobrać opisu makrodefinicji.</translation>
     </message>
   </context>
   <context>
@@ -425,4 +305,139 @@ zostaną użyte w poszukiwaniu dostępnych dodatków</translation>
       <translation>Zarządzaj zewnętrznymi Środowiskami pracy i makrodefinicjami</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Menedżer dodatków</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Środowiska
+    pracy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makrodefinicje</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Rozpoczyna wykonywanie wybranego makra, jeśli jest zainstalowane</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Wykonaj</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Ustawia opcje konfiguracji dla Menedżera dodatków</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Konfiguruj...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Pobieranie informacji...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Odinstalowuje wybrane makrodefinicje lub środowisko pracy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Odinstaluj wybrane</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instaluje lub aktualizuje wybrane makrodefinicje lub środowisko pracy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Zainstaluj / zaktualizuj wybrane</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Pobierz i zainstaluj wszystkie dostępne aktualizacje</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Aktualizuj wszystko</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Zamknij Menedżera dodatków</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Zamknij</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opcje menedżera dodatków</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Jeśli ta opcja jest zaznaczona, podczas uruchamiania Menedżera Dodatków,
+zainstalowane dodatki zostaną sprawdzone pod kątem dostępnych aktualizacji
+(wymaga to zainstalowanego pakietu GitPython w systemie)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Automatycznie sprawdzaj aktualizacje podczas uruchomienia (wymaga GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repozytoria użytkownika (jedno na linię):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Możesz użyć tego okna, aby określić dodatkowe repozytoria dodatków które
+zostaną użyte w poszukiwaniu dostępnych dodatków</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Brak proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Proxy systemu użytkownika</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy zdefiniowane przez użytkownika:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_pt-BR.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="pt-BR" sourcelanguage="en">
+<TS version="2.1" language="pt-BR" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Incapaz de buscar o código desta macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Incapaz de baixar a list de suplmentos.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Não é possível exibir uma descrição deste macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Lista de workbenches atualizada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>GitPython desatualizado detectado, considere atualizar com pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Lista de macros obtida com sucesso.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython não instalado! Não é possível recuperar macros do git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Algo deu errado com o Git Macro Retrieval, possivelmente o executável Git não está no caminho</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Parece haver um problema conectando ao Wiki, portanto não foi possível recuperar a lista de macros Wiki neste momento</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Recuperando descrição...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Recuperando informações de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Marcação bruta exibida</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Biblioteca Python Markdown está faltando.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Uma atualização para esta extensão está disponível.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Esta extensão já está instalada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Essa extensão está marcada como obsoleta</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Isso geralmente significa que ela não é mais mantida, e outra extensão mais avançada nesta lista fornece a mesma funcionalidade.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Esta extensão é marcada como apenas para Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Esta bancada não pode mais ser mantida e instalá-la em um sistema Python 3 irá mais do que provavelmente resultar em erros na inicialização ou quando em uso.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Recuperando informações do git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Recuperando informações da wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Esta macro já está instalada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython não encontrado. Usando o download padrão em vez disso.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Sua versão do python parece não suportar arquivos ZIP. Não é possível prosseguir.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>O usuário solicitou a atualização de uma bancada de trabalho Python 2 em um sistema que usa Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Bancada atualizada com sucesso. Por favor, reinicie o FreeCAD para aplicar as alterações.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>O usuário solicitou a instalação de uma bancada de trabalho Python 2 em um sistema que usa Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Bancada de trabalho instalada. Reinicie o FreeCAD para aplicar as alterações.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Uma macro foi instalada e está disponível no menu Macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Bancada de trabalho não localizada</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Modulo Python não localizado</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Faltando módulo python opcional (não impede a instalação)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Foram encontrados alguns erros que impedem a instalação desta bancada de trabalho</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Por favor, primeiro instale os componentes faltantes.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Erro: Não foi possível localizar o zip de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Erro: Não foi possível baixar</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Instalado com sucesso</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Gestor de Suplementos</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Reinicie o FreeCAD para que as mudanças tenham efeito. OK para reiniciar ou Cancelar para reiniciar mais tarde.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Sem atualização disponível</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Instalado</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>A macro não pode ser removida.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Incapaz de baixar a list de suplmentos.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Lista de workbenches atualizada.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>GitPython desatualizado detectado, considere atualizar com pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Lista de macros obtida com sucesso.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Recuperando descrição...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Recuperando informações de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Uma atualização para esta extensão está disponível.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Esta extensão já está instalada.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Recuperando informações do git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Recuperando informações da wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython não encontrado. Usando o download padrão em vez disso.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Sua versão do python parece não suportar arquivos ZIP. Não é possível prosseguir.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Bancada de trabalho instalada. Reinicie o FreeCAD para aplicar as alterações.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Bancada de trabalho não localizada</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Modulo Python não localizado</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Faltando módulo python opcional (não impede a instalação)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Foram encontrados alguns erros que impedem a instalação desta bancada de trabalho</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Por favor, primeiro instale os componentes faltantes.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Erro: Não foi possível baixar</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Instalado com sucesso</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython não instalado! Não é possível recuperar macros do git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Instalado</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,207 +282,14 @@
       <translation>Reinicialização necessária</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Esta macro já está instalada.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Incapaz de buscar o código desta macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Uma macro foi instalada e está disponível no menu Macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Essa extensão está marcada como obsoleta</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Isso geralmente significa que ela não é mais mantida, e outra extensão mais avançada nesta lista fornece a mesma funcionalidade.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Erro: Não foi possível localizar o zip de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Algo deu errado com o Git Macro Retrieval, possivelmente o executável Git não está no caminho</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Esta extensão é marcada como apenas para Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Esta bancada não pode mais ser mantida e instalá-la em um sistema Python 3 irá mais do que provavelmente resultar em erros na inicialização ou quando em uso.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>O usuário solicitou a atualização de uma bancada de trabalho Python 2 em um sistema que usa Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Bancada atualizada com sucesso. Por favor, reinicie o FreeCAD para aplicar as alterações.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>O usuário solicitou a instalação de uma bancada de trabalho Python 2 em um sistema que usa Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Parece haver um problema conectando ao Wiki, portanto não foi possível recuperar a lista de macros Wiki neste momento</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Marcação bruta exibida</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Biblioteca Python Markdown está faltando.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Bancadas de trabalho</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macros</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Executar</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Baixando informações...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Atualizar todos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Executa a macro selecionada, se instalada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Desinstala uma macro ou bancada de trabalho selecionada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instala ou atualiza a macro ou bancada de trabalho selecionada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Baixar e aplicar todas as atualizações disponíveis</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repositórios personalizados (um por linha):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Define as opções de configuração para o Gerenciador de Extensões</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configurar...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opções de gerenciamento de Extensões</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Desinstalar selecionado(s)</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instalar/atualizar selecionado(s)</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Fechar</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Se esta opção for selecionada, ao iniciar o Gerenciador de Complementos,
-addons instalados serão verificados para há atualizações disponíveis
-(requer o pacote do GitPython instalado em seu sistema)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Verificar automaticamente por atualizações na inicialização (requer python-git)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Sem proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Proxy do sistema do usuário</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy definido pelo usuário :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Gerenciador de Extensões</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Fechar o Gerenciador de Extensões</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Você pode usar esta janela para especificar repositórios adicionais de extensões a serem verificados para as extensões disponíveis</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Não é possível exibir uma descrição deste macro.</translation>
     </message>
   </context>
   <context>
@@ -423,4 +305,137 @@ to be scanned for available addons</source>
       <translation>Gerenciar bancadas e macros externos</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Gerenciador de Extensões</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Bancadas de trabalho</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macros</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Executa a macro selecionada, se instalada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Executar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Define as opções de configuração para o Gerenciador de Extensões</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configurar...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Baixando informações...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Desinstala uma macro ou bancada de trabalho selecionada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Desinstalar selecionado(s)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instala ou atualiza a macro ou bancada de trabalho selecionada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instalar/atualizar selecionado(s)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Baixar e aplicar todas as atualizações disponíveis</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Atualizar todos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Fechar o Gerenciador de Extensões</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Fechar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opções de gerenciamento de Extensões</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Se esta opção for selecionada, ao iniciar o Gerenciador de Complementos,
+addons instalados serão verificados para há atualizações disponíveis
+(requer o pacote do GitPython instalado em seu sistema)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Verificar automaticamente por atualizações na inicialização (requer python-git)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repositórios personalizados (um por linha):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Você pode usar esta janela para especificar repositórios adicionais de extensões a serem verificados para as extensões disponíveis</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Sem proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Proxy do sistema do usuário</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy definido pelo usuário :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_pt-PT.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="pt-PT" sourcelanguage="en">
+<TS version="2.1" language="pt-PT" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Não foi possível alcançar o código desta macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Incapaz de descarregar a lista de extras.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Não foi possível encontrar uma descrição para esta macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>A lista de Bancadas de Trabalho foi atualizada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Detetado GitPython desactualizado, considere atualizar com pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Lista de macros atualizada com sucesso.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython não está instalado! Não é possível descarregar macros do git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Algo correu mal com a descarga da Macro do Git, possivelmente o executável Git não está no caminho especificado</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Parece haver um problema com a ligação à Wiki, portanto neste momento não é possível recuperar a lista Wiki de macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Obtendo descrição...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Obtendo informações de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation type="unfinished">Raw markdown displayed</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Falta biblioteca Python Markdown.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Uma atualização está disponível para esse extra.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Este extra já está instalado.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Este extra está marcado como obsoleto</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Isto geralmente significa que já não é mantido, e algum extra mais atualizado nesta lista fornece a mesma funcionalidade.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Este complemento é marcado apenas como Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Esta bancada de trabalho não pode mais ser mantida e instalá-la em um sistema Python 3 irá provavelmente resultar em erros no arranque ou quando em uso.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Obtendo informações do git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Obtendo informações da wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Esta macro já está instalada.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython não foi encontrado. Em vez disso, será usado o descarregamento padrão.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>A sua versão de python parece não suportar ficheiros ZIP. Não é possível prosseguir.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Utilizador solicitou atualização de uma bancada de trabalho Python 2 num sistema que executa Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Bancada de trabalho atualizada com sucesso. Por favor reinicie o FreeCAD para aplicar as alterações.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Utilizador solicitou instalação de uma bancada de trabalho Python 2 num sistema que executa Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Bancada de trabalho instalada com sucesso. Por favor, reinicie o FreeCAD para aplicar as alterações.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Uma macro foi instalada e está disponível no menu Macro -&gt; Macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Bancada de trabalho em falta</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Módulo python em falta</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Módulo python opcional em falta (não impede instalação)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Foram encontrados erros que impedem a instalação desta bancada de trabalho</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Por favor, instale os componentes em falta primeiro.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Erro: Não foi possível localizar o zip de</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Erro: Não foi possível descarregar</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Instalado com sucesso</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Gestor de extras</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Reinicie o FreeCAD para que as alterações tenham efeito. Ok para reiniciar ou Cancelar para reiniciar mais tarde.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Sem atualizações disponíveis</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Instalado</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>A macro não pode ser removida.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Incapaz de descarregar a lista de extras.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>A lista de Bancadas de Trabalho foi atualizada.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Detetado GitPython desactualizado, considere atualizar com pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Lista de macros atualizada com sucesso.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Obtendo descrição...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Obtendo informações de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Uma atualização está disponível para esse extra.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Este extra já está instalado.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Obtendo informações do git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Obtendo informações da wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython não foi encontrado. Em vez disso, será usado o descarregamento padrão.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>A sua versão de python parece não suportar ficheiros ZIP. Não é possível prosseguir.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Bancada de trabalho instalada com sucesso. Por favor, reinicie o FreeCAD para aplicar as alterações.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Bancada de trabalho em falta</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Módulo python em falta</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Módulo python opcional em falta (não impede instalação)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Foram encontrados erros que impedem a instalação desta bancada de trabalho</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Por favor, instale os componentes em falta primeiro.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Erro: Não foi possível descarregar</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Instalado com sucesso</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython não está instalado! Não é possível descarregar macros do git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Instalado</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Reinicio necessário</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Esta macro já está instalada.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Não foi possível alcançar o código desta macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Uma macro foi instalada e está disponível no menu Macro -&gt; Macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Este extra está marcado como obsoleto</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Isto geralmente significa que já não é mantido, e algum extra mais atualizado nesta lista fornece a mesma funcionalidade.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Erro: Não foi possível localizar o zip de</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Algo correu mal com a descarga da Macro do Git, possivelmente o executável Git não está no caminho especificado</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Este complemento é marcado apenas como Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Esta bancada de trabalho não pode mais ser mantida e instalá-la em um sistema Python 3 irá provavelmente resultar em erros no arranque ou quando em uso.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Utilizador solicitou atualização de uma bancada de trabalho Python 2 num sistema que executa Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Bancada de trabalho atualizada com sucesso. Por favor reinicie o FreeCAD para aplicar as alterações.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Utilizador solicitou instalação de uma bancada de trabalho Python 2 num sistema que executa Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Parece haver um problema com a ligação à Wiki, portanto neste momento não é possível recuperar a lista Wiki de macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation type="unfinished">Raw markdown displayed</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Falta biblioteca Python Markdown.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Bancadas de trabalho</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macros</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Executar</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Descarregando informações...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Atualizar tudo</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Executa a macro selecionada, se instalada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Desinstala uma macro ou bancada de trabalho selecionada</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instala ou atualiza a macro selecionada ou a bancada de trabalho</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Baixar e aplicar todas as atualizações disponíveis</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repositórios personalizados (um por linha):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Define as opções de configuração para o Gestor de extras</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configurar...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opções do gerenciador de complementos</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Desinstalar selecionado</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instalar/atualizar selecionados</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Fechar</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Se esta opção for selecionada, ao iniciar o Gestor de Add-ons,
-complementos instalados serão verificados para atualizações disponíveis
-(requer o pacote do GitPython instalado em seu sistema)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Verificar automaticamente se há atualizações no arranque (requer GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Nenhum proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation type="unfinished">User system proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy definido pelo utilizador :</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Gestor de Add-ons</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Feche o Gestor de Add-ons</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Você pode usar esta janela para especificar repositórios adicionais
-para procurar complementos disponíveis</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Não foi possível encontrar uma descrição para esta macro.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ para procurar complementos disponíveis</translation>
       <translation>Gerir bancadas de trabalho e macros externas</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Gestor de Add-ons</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Bancadas de trabalho</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macros</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Executa a macro selecionada, se instalada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Executar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Define as opções de configuração para o Gestor de extras</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configurar...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Descarregando informações...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Desinstala uma macro ou bancada de trabalho selecionada</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Desinstalar selecionado</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instala ou atualiza a macro selecionada ou a bancada de trabalho</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instalar/atualizar selecionados</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Baixar e aplicar todas as atualizações disponíveis</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Atualizar tudo</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Feche o Gestor de Add-ons</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Fechar</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opções do gerenciador de complementos</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Se esta opção for selecionada, ao iniciar o Gestor de Add-ons,
+complementos instalados serão verificados para atualizações disponíveis
+(requer o pacote do GitPython instalado em seu sistema)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Verificar automaticamente se há atualizações no arranque (requer GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repositórios personalizados (um por linha):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Você pode usar esta janela para especificar repositórios adicionais
+para procurar complementos disponíveis</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Nenhum proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation type="unfinished">User system proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy definido pelo utilizador :</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_ro.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="ro" sourcelanguage="en">
+<TS version="2.1" language="ro" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Nu se poate recupera codul acestui macro.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Imposibil de descărcat lista de adăugări.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Nu s-a putut găsi o descriere pentru acest macro.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Lista atelierelor a fost actualizată.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>GitPython vechi detectat, luați în considerare actualizarea cu pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Lista macro-urilor recuperate cu succes.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython nu este instalat! Nu se pot recupera macro-urile din git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Ceva nu a mers bine cu Git Macro Retrieval, probabil executabilul Git nu se află in adresă</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Pare că există o problemă in conectarea la Wiki, prin urmare momentan nu se poate prelua lista de macro Wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Recuperez descrierea...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Preluarea informațiilor de la</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Marcaj brut afișat</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Lipsește biblioteca Python Markdown.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>O actualizare este disponibilă pentru acest addon.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Acest addon este deja instalat.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Acest addon este marcat ca expirat</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>De obicei acest lucru inseamnă că nu mai este menținut, iar unele addon-uri mai avansate oferă aceleași funcții.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Acest supliment este marcat ca Python 2 doar</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Acest ambient de lucru nu mai poate fi întreținut și instalarea sa pe un sistem Python 3 va cauza mai mult decât probabil erori la pornire sau în timpul utilizării.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Preluare informații de la git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Preluare informații de la wiki</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Acest macro este deja instalat.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython nu a fost găsit. Se folosește descarcarea standard în schimb.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Versiunea dumneavoastră de Pyton nu suportă fișierele de tip ZIP. Nu se poate continua.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Utilizatorul a solicitat actualizarea unui ambient de lucru Python 2 pe un sistem care rulează Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Ambientul de lucru fost instalat cu succes. Reporniţi FreeCAD pentru a aplica modificările.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Utilizatorul a solicitat actualizarea unui ambient de lucru Python 2 pe un sistem care rulează Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Ambientul de lucru fost instalat cu succes. Reporniţi FreeCAD pentru a aplica modificările.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Un macro a fost instalat și este disponibil sub meniul Macro -&gt; Macros</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Lipsește ambientul de lucru</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Lipsește modulul Python</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Modulul opțional Python lipsește (nu împiedică instalarea)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Au fost găsite unele erori care împiedică instalarea ambientului de lucru</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Vă rugăm instalați mai întâi componentele lipsă.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Eroare: Nu se poate localiza zip de la</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Eroare: Imposibil de descărcat</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Instalat cu succes</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Manager de addon</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Trebuie să reporniți FreeCAD pentru ca modificările să aibă efect. Apăsați Ok pentru a reporni FreeCAD acum, sau Anulați pentru a reporni mai târziu.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Nu există actualizări disponibile</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Instalat</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Macro nu a putut fi eliminat.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Imposibil de descărcat lista de adăugări.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Lista atelierelor a fost actualizată.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>GitPython vechi detectat, luați în considerare actualizarea cu pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Lista macro-urilor recuperate cu succes.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Recuperez descrierea...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Preluarea informațiilor de la</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>O actualizare este disponibilă pentru acest addon.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Acest addon este deja instalat.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Preluare informații de la git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Preluare informații de la wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython nu a fost găsit. Se folosește descarcarea standard în schimb.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Versiunea dumneavoastră de Pyton nu suportă fișierele de tip ZIP. Nu se poate continua.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Ambientul de lucru fost instalat cu succes. Reporniţi FreeCAD pentru a aplica modificările.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Lipsește ambientul de lucru</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Lipsește modulul Python</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Modulul opțional Python lipsește (nu împiedică instalarea)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Au fost găsite unele erori care împiedică instalarea ambientului de lucru</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Vă rugăm instalați mai întâi componentele lipsă.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Eroare: Imposibil de descărcat</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Instalat cu succes</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython nu este instalat! Nu se pot recupera macro-urile din git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Instalat</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Repornire necesară</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Acest macro este deja instalat.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Nu se poate recupera codul acestui macro.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Un macro a fost instalat și este disponibil sub meniul Macro -&gt; Macros</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Acest addon este marcat ca expirat</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>De obicei acest lucru inseamnă că nu mai este menținut, iar unele addon-uri mai avansate oferă aceleași funcții.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Eroare: Nu se poate localiza zip de la</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Ceva nu a mers bine cu Git Macro Retrieval, probabil executabilul Git nu se află in adresă</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Acest supliment este marcat ca Python 2 doar</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Acest ambient de lucru nu mai poate fi întreținut și instalarea sa pe un sistem Python 3 va cauza mai mult decât probabil erori la pornire sau în timpul utilizării.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Utilizatorul a solicitat actualizarea unui ambient de lucru Python 2 pe un sistem care rulează Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Ambientul de lucru fost instalat cu succes. Reporniţi FreeCAD pentru a aplica modificările.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Utilizatorul a solicitat actualizarea unui ambient de lucru Python 2 pe un sistem care rulează Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Pare că există o problemă in conectarea la Wiki, prin urmare momentan nu se poate prelua lista de macro Wiki</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Marcaj brut afișat</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Lipsește biblioteca Python Markdown.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Banc de lucru</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Macro-uri</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Execută</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Se descarcă informațiile...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Actualizeaza toate modulele</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Execută macroul selectat, dacă este instalat</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Dezinstalează un macro sau un ambient de lucru selectat</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Instalează sau actualizează macro-ul sau ambientul de lucru</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Descarcă și aplică toate actualizările disponibile</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Repo-uri personalizate (unul pe linie):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Definirea opțiunilor de configurare pentru Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Configurează...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Opțiuni pentru managerul de addon-uri</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Dezinstalează selectarea</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Instalare/actualizare selecția</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Închide</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Dacă această opţiune este selectată, la lansarea Addon Manager,
-addon-urile instalate vor fi verificate pentru actualizările disponibile
-(acest lucru necesită pachetul GitPython instalat pe sistemul dumneavoastră)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Verificare automată a actualizărilor la deschidere (necesită GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Proxy </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Fără proxy</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Proxy sistem utilizator</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Proxy definit de utilizator:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Manager de addon</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Închide Addon Manager</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Puteți utiliza această fereastră pentru a specifica depozite addon suplimentare
-pentru a fi scanate pentru suplimentele disponibile</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Nu s-a putut găsi o descriere pentru acest macro.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ pentru a fi scanate pentru suplimentele disponibile</translation>
       <translation>Gestionează ambientele de lucru și macro-urile externe</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Manager de addon</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Banc de lucru</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Macro-uri</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Execută macroul selectat, dacă este instalat</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Execută</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Definirea opțiunilor de configurare pentru Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Configurează...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Se descarcă informațiile...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Dezinstalează un macro sau un ambient de lucru selectat</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Dezinstalează selectarea</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Instalează sau actualizează macro-ul sau ambientul de lucru</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Instalare/actualizare selecția</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Descarcă și aplică toate actualizările disponibile</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Actualizeaza toate modulele</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Închide Addon Manager</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Închide</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Opțiuni pentru managerul de addon-uri</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Dacă această opţiune este selectată, la lansarea Addon Manager,
+addon-urile instalate vor fi verificate pentru actualizările disponibile
+(acest lucru necesită pachetul GitPython instalat pe sistemul dumneavoastră)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Verificare automată a actualizărilor la deschidere (necesită GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Repo-uri personalizate (unul pe linie):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Puteți utiliza această fereastră pentru a specifica depozite addon suplimentare
+pentru a fi scanate pentru suplimentele disponibile</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Proxy </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Fără proxy</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Proxy sistem utilizator</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Proxy definit de utilizator:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_ru.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="ru" sourcelanguage="en">
+<TS version="2.1" language="ru" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Не удается получить код этого макроса.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Не удается загрузить список дополнений.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Не удается получить описание для этого макроса.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Список рабочих окружений обновлен.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Обнаружен устаревший GitPython, рассмотрите обновление с помощью pip.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Список макросов успешно получен.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython не установлен! Не удается получить макрос из git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Что-то пошло не так при запросе макроса с сайта Git. Возможно исполняемый файл Git не находится в нужном месте</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Возможно, возникла проблема при подключении к Wiki, поэтому в данный момент не удается получить список Wiki-макросов</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Получение описания...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Получение информации от</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Показана исходная разметка</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Библиотека Python Markdown отсутствует.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Для этого дополнения доступно обновление.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Это дополнение уже установлено.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Это дополнение помечено как устаревшее</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>Это обычно означает, что оно больше не поддерживается, и некоторые более продвинутые дополнения в этом списке обеспечивают те же функции.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Это дополнение помечено Только для Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>Этот верстак больше не может быть поддержан, и установка его на систему с Python 3, вероятно, вызовет ошибки при запуске или во время использования.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Получение информации из git</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Получение информации из вики</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Этот макрос уже установлен.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython не найден. Вместо этого используется стандартная загрузка.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>По-видимому, ваша версия python не поддерживает ZIP файлы. Продолжение невозможно.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Пользователь запросил обновление рабочего стола Python 2 на системе, запущенной с Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Верстак успешно обновлен. Перезапустите FreeCAD, чтобы применить изменения.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Пользователь запросил установить верстак для Python 2 на системе Python 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Рабочее окружение успешно установлено. Пожалуйста, перезапустите FreeCAD для применения изменений.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Макрос установлен и доступен меню Макросы -&gt; макрос</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Отсутствует рабочее окружение</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Отсутствует модуль python</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Отсутствует дополнительный модуль python (не запрещает установку)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Найдены некоторые ошибки, которые мешают установке этого рабочего окружения</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Сначала установите недостающие компоненты.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Ошибка: Не удается найти zip из</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Ошибка: Не удалось загрузить</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Успешно установлено</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Менеджер дополнений</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Вы должны перезапустить FreeCAD для применения изменений. Нажмите Ok, чтобы перезапустить FreeCAD сейчас, или Отменить, чтобы перезапустить позже.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Нет доступных обновлений</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Установлен</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Макрос не может быть удален.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Не удается загрузить список дополнений.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Список рабочих окружений обновлен.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Обнаружен устаревший GitPython, рассмотрите обновление с помощью pip.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Список макросов успешно получен.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Получение описания...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Получение информации от</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Для этого дополнения доступно обновление.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Это дополнение уже установлено.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Получение информации из git</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Получение информации из вики</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython не найден. Вместо этого используется стандартная загрузка.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>По-видимому, ваша версия python не поддерживает ZIP файлы. Продолжение невозможно.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Рабочее окружение успешно установлено. Пожалуйста, перезапустите FreeCAD для применения изменений.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Отсутствует рабочее окружение</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Отсутствует модуль python</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Отсутствует дополнительный модуль python (не запрещает установку)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Найдены некоторые ошибки, которые мешают установке этого рабочего окружения</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Сначала установите недостающие компоненты.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Ошибка: Не удалось загрузить</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Успешно установлено</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython не установлен! Не удается получить макрос из git</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Установлен</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,206 +282,14 @@
       <translation>Требуется перезапуск</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Этот макрос уже установлен.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Не удается получить код этого макроса.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Макрос установлен и доступен меню Макросы -&gt; макрос</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Это дополнение помечено как устаревшее</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>Это обычно означает, что оно больше не поддерживается, и некоторые более продвинутые дополнения в этом списке обеспечивают те же функции.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Ошибка: Не удается найти zip из</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Что-то пошло не так при запросе макроса с сайта Git. Возможно исполняемый файл Git не находится в нужном месте</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Это дополнение помечено Только для Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>Этот верстак больше не может быть поддержан, и установка его на систему с Python 3, вероятно, вызовет ошибки при запуске или во время использования.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Пользователь запросил обновление рабочего стола Python 2 на системе, запущенной с Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Верстак успешно обновлен. Перезапустите FreeCAD, чтобы применить изменения.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Пользователь запросил установить верстак для Python 2 на системе Python 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Возможно, возникла проблема при подключении к Wiki, поэтому в данный момент не удается получить список Wiki-макросов</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Показана исходная разметка</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Библиотека Python Markdown отсутствует.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Рабочие окружения</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Макрос</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Выполнить</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Загрузка информации...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Обновить все</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Выполняет выбранный макрос, если установлен</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Удаление выбранного макроса или рабочего окружения</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Устанавливает или обновляет выбранный макрос или рабочее окружение</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Скачать и применить все доступные обновления</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Дополнительные репозитории (один в строке):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Настроить параметры конфигурации для менеджера дополнений</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Настроить...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Настройки менеджера дополнений</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Удалить выбранные</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Установка/обновление выбранных</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Закрыть</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Если эта опция выбрана, при запуске менеджера дополнений, установленные дополнения будут проверены на наличие доступных обновлений (требуется пакет GitPython, установленный в вашей системе)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Автоматически проверять обновления при запуске (требуется GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Прокси-сервер </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Нет</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Системный прокси-сервер пользователя</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Заданный пользователем прокси-сервер:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Менеджер дополнений</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Закрыть Менеджер дополнений</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>Вы можете использовать это окно для указания дополнительных репозиториев дополнений
-для сканирования доступных дополнений</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Не удается получить описание для этого макроса.</translation>
     </message>
   </context>
   <context>
@@ -422,4 +305,136 @@ to be scanned for available addons</source>
       <translation>Управление внешними рабочими окружениями и макросами</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Менеджер дополнений</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Рабочие окружения</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Макрос</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Выполняет выбранный макрос, если установлен</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Выполнить</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Настроить параметры конфигурации для менеджера дополнений</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Настроить...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Загрузка информации...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Удаление выбранного макроса или рабочего окружения</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Удалить выбранные</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Устанавливает или обновляет выбранный макрос или рабочее окружение</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Установка/обновление выбранных</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Скачать и применить все доступные обновления</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Обновить все</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Закрыть Менеджер дополнений</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Закрыть</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Настройки менеджера дополнений</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Если эта опция выбрана, при запуске менеджера дополнений, установленные дополнения будут проверены на наличие доступных обновлений (требуется пакет GitPython, установленный в вашей системе)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Автоматически проверять обновления при запуске (требуется GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Дополнительные репозитории (один в строке):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>Вы можете использовать это окно для указания дополнительных репозиториев дополнений
+для сканирования доступных дополнений</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Прокси-сервер </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Нет</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Системный прокси-сервер пользователя</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Заданный пользователем прокси-сервер:</translation>
+    </message>
+  </context>
 </TS>

src/Mod/AddonManager/Resources/translations/AddonManager_sl.ts

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="1.1" language="sl" sourcelanguage="en">
+<TS version="2.1" language="sl" sourcelanguage="en">
   <context>
     <name>AddonInstaller</name>
     <message>
@@ -12,14 +12,179 @@
   <context>
     <name>AddonsInstaller</name>
     <message>
-      <location filename="addonmanager_macro.py" line="157"/>
-      <source>Unable to fetch the code of this macro.</source>
-      <translation>Kode tega makra ni mogoče pridobiti.</translation>
+      <location filename="addonmanager_workers.py" line="167"/>
+      <source>Unable to download addon list.</source>
+      <translation>Seznama dodatkov ni bilo mogoče prenesti.</translation>
     </message>
     <message>
-      <location filename="addonmanager_macro.py" line="164"/>
-      <source>Unable to retrieve a description for this macro.</source>
-      <translation>Opisa tega makra ni mogoče pridobiti.</translation>
+      <location filename="addonmanager_workers.py" line="172"/>
+      <source>Workbenches list was updated.</source>
+      <translation>Seznam delovnih okolij je bil posodobljen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="738"/>
+      <source>Outdated GitPython detected, consider upgrading with pip.</source>
+      <translation>Zaznan je zastarel GitPython; razmislite o nadgraditivi s pip-om.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="296"/>
+      <source>List of macros successfully retrieved.</source>
+      <translation>Seznam makrov uspšno pridobljen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="310"/>
+      <source>GitPython not installed! Cannot retrieve macros from git</source>
+      <translation>GitPython ni nameščen! Makrov ni mogoče pridobiti iz git-a</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="319"/>
+      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
+      <translation>Pri pridobivanju Git makra se je nekje zalomilo. Najverjetneje Git-ove izvršljive datoteke ni na tej poti</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="343"/>
+      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
+      <translation>Kaže, da je težava v povezavi z Wiki, zaradi česa trenutno ni mogoče pridobiti seznama Wiki makrov</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="651"/>
+      <source>Retrieving description...</source>
+      <translation>Pridobivanje opisov ...</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="391"/>
+      <source>Retrieving info from</source>
+      <translation>Pridobivanje podatkov iz</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="433"/>
+      <source>Raw markdown displayed</source>
+      <translation>Prikazan surov Markdown</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="435"/>
+      <source>Python Markdown library is missing.</source>
+      <translation>Knjižnica Python Markdowna manjka.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="533"/>
+      <source>An update is available for this addon.</source>
+      <translation>Posodobitev za ta dodatek je na voljo.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="521"/>
+      <source>This addon is already installed.</source>
+      <translation>Ta dodatek je že nameščen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="547"/>
+      <source>This addon is marked as obsolete</source>
+      <translation>Ta dodatek je označen kot zastarel</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="551"/>
+      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
+      <translation>To ponavadi pomeni, da ni več vzdrževan in naprednejši dodatek s tega seznama nudi enake zmožnosti.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="559"/>
+      <source>This addon is marked as Python 2 Only</source>
+      <translation>Ta dodatek je označen, da je le za Python 2</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="564"/>
+      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
+      <translation>To delovno okolje lahko ni več vzdrževano in namestitev v Python 3 okolje bo najverjetneje prinesla napake pri zagonu ali med delovanjem.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="653"/>
+      <source>Retrieving info from git</source>
+      <translation>Pridobivanje podatkov iz git-a</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="656"/>
+      <source>Retrieving info from wiki</source>
+      <translation>Pridobivanje podatkov iz wiki strani</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="665"/>
+      <source>This macro is already installed.</source>
+      <translation>Ta makro je že nameščen.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="700"/>
+      <source>GitPython not found. Using standard download instead.</source>
+      <translation>GitPython ni mogoče najti. Namesto tega je običajno prenašanje.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="705"/>
+      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
+      <translation>Kot kaže, vaša različica Pythona ne podpira datotek ZIP. Ni mogoče nadaljevati.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="727"/>
+      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Uporabnik je zaprosil posodobitev Python 2 delovnega okolja na okolje, ki se izvaja v Pythonu 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="763"/>
+      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
+      <translation>Delovno okolje je uspešno posodobljeno. Za uveljavitev sprememb ponovno zaženite FreeCAD.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="771"/>
+      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
+      <translation>Uporabnik je zaprosil namestitev Python 2 delovnega okolja na okolje, ki se izvaja v Pythonu 3 - </translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="786"/>
+      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
+      <translation>Delovno okolje uspešno nameščeno. Za uveljavitev sprememb ponovno zaženite FreeCAD.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="799"/>
+      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
+      <translation>Makro je bil namščen in je dosegljiv preko menija Makro -&gt; Makri</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="835"/>
+      <source>Missing workbench</source>
+      <translation>Manjkajoče delovno oklje</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="844"/>
+      <source>Missing python module</source>
+      <translation>Manjkajoči Pythonov modul</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="854"/>
+      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
+      <translation>Manjkajoči neobvezni Pythonov modul (ne ustavi namestitve)</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="857"/>
+      <source>Some errors were found that prevent to install this workbench</source>
+      <translation>Najdene so bile določene napake, ki preprečujejo namestitev tega delovnega okolja</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="859"/>
+      <source>Please install the missing components first.</source>
+      <translation>Namestite najprej manjkajoče sestavine.</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="873"/>
+      <source>Error: Unable to locate zip from</source>
+      <translation>Napaka: Ni mogoče najti zipa od</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="880"/>
+      <source>Error: Unable to download</source>
+      <translation>Napaka: Ni mogoče prenesti</translation>
+    </message>
+    <message>
+      <location filename="addonmanager_workers.py" line="893"/>
+      <source>Successfully installed</source>
+      <translation>Uspešno nameščeno</translation>
     </message>
     <message>
       <location filename="AddonManager.py" line="86"/>
@@ -31,11 +196,26 @@
       <source>Addon manager</source>
       <translation>Upravljalnik dodatkov</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="203"/>
+      <source>You must restart FreeCAD for changes to take effect.</source>
+      <translation type="unfinished">You must restart FreeCAD for changes to take effect.</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="204"/>
       <source>You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later.</source>
       <translation>Za uveljavitev sprememb je potrebno FreeCAD ponovno zaganti. Za takojšen ponovni zagon klinite V redu, če želite ponovno zagnati kasneje, pa kliknite Prekliči.</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="209"/>
+      <source>Restart now</source>
+      <translation type="unfinished">Restart now</translation>
+    </message>
+    <message>
+      <location filename="AddonManager.py" line="210"/>
+      <source>Restart later</source>
+      <translation type="unfinished">Restart later</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="243"/>
       <source>Checking for updates...</source>
@@ -56,6 +236,11 @@
       <source>No update available</source>
       <translation>Posodobitev ni na voljo</translation>
     </message>
+    <message>
+      <location filename="AddonManager.py" line="567"/>
+      <source>Installed</source>
+      <translation>Nameščeno</translation>
+    </message>
     <message>
       <location filename="AddonManager.py" line="433"/>
       <source>Macro successfully installed. The macro is now available from the Macros dialog.</source>
@@ -86,116 +271,6 @@
       <source>Macro could not be removed.</source>
       <translation>Makra ni bilo mogoče odstraniti.</translation>
     </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="167"/>
-      <source>Unable to download addon list.</source>
-      <translation>Seznama dodatkov ni bilo mogoče prenesti.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="172"/>
-      <source>Workbenches list was updated.</source>
-      <translation>Seznam delovnih okolij je bil posodobljen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="738"/>
-      <source>Outdated GitPython detected, consider upgrading with pip.</source>
-      <translation>Zaznan je zastarel GitPython; razmislite o nadgraditivi s pip-om.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="296"/>
-      <source>List of macros successfully retrieved.</source>
-      <translation>Seznam makrov uspšno pridobljen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="651"/>
-      <source>Retrieving description...</source>
-      <translation>Pridobivanje opisov ...</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="391"/>
-      <source>Retrieving info from</source>
-      <translation>Pridobivanje podatkov iz</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="533"/>
-      <source>An update is available for this addon.</source>
-      <translation>Posodobitev za ta dodatek je na voljo.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="521"/>
-      <source>This addon is already installed.</source>
-      <translation>Ta dodatek je že nameščen.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="653"/>
-      <source>Retrieving info from git</source>
-      <translation>Pridobivanje podatkov iz git-a</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="656"/>
-      <source>Retrieving info from wiki</source>
-      <translation>Pridobivanje podatkov iz wiki strani</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="700"/>
-      <source>GitPython not found. Using standard download instead.</source>
-      <translation>GitPython ni mogoče najti. Namesto tega je običajno prenašanje.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="705"/>
-      <source>Your version of python doesn&apos;t appear to support ZIP files. Unable to proceed.</source>
-      <translation>Kot kaže, vaša različica Pythona ne podpira datotek ZIP. Ni mogoče nadaljevati.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="786"/>
-      <source>Workbench successfully installed. Please restart FreeCAD to apply the changes.</source>
-      <translation>Delovno okolje uspešno nameščeno. Za uveljavitev sprememb ponovno zaženite FreeCAD.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="835"/>
-      <source>Missing workbench</source>
-      <translation>Manjkajoče delovno oklje</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="844"/>
-      <source>Missing python module</source>
-      <translation>Manjkajoči Pythonov modul</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="854"/>
-      <source>Missing optional python module (doesn&apos;t prevent installing)</source>
-      <translation>Manjkajoči neobvezni Pythonov modul (ne ustavi namestitve)</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="857"/>
-      <source>Some errors were found that prevent to install this workbench</source>
-      <translation>Najdene so bile določene napake, ki preprečujejo namestitev tega delovnega okolja</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="859"/>
-      <source>Please install the missing components first.</source>
-      <translation>Namestite najprej manjkajoče sestavine.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="880"/>
-      <source>Error: Unable to download</source>
-      <translation>Napaka: Ni mogoče prenesti</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="893"/>
-      <source>Successfully installed</source>
-      <translation>Uspešno nameščeno</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="310"/>
-      <source>GitPython not installed! Cannot retrieve macros from git</source>
-      <translation>GitPython ni nameščen! Makrov ni mogoče pridobiti iz git-a</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.py" line="567"/>
-      <source>Installed</source>
-      <translation>Nameščeno</translation>
-    </message>
     <message>
       <location filename="AddonManager.py" line="586"/>
       <source>Update available</source>
@@ -207,208 +282,14 @@
       <translation>Potreben ponovni zagon</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="665"/>
-      <source>This macro is already installed.</source>
-      <translation>Ta makro je že nameščen.</translation>
+      <location filename="addonmanager_macro.py" line="157"/>
+      <source>Unable to fetch the code of this macro.</source>
+      <translation>Kode tega makra ni mogoče pridobiti.</translation>
     </message>
     <message>
-      <location filename="addonmanager_workers.py" line="799"/>
-      <source>A macro has been installed and is available under Macro -&gt; Macros menu</source>
-      <translation>Makro je bil namščen in je dosegljiv preko menija Makro -&gt; Makri</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="547"/>
-      <source>This addon is marked as obsolete</source>
-      <translation>Ta dodatek je označen kot zastarel</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="551"/>
-      <source>This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality.</source>
-      <translation>To ponavadi pomeni, da ni več vzdrževan in naprednejši dodatek s tega seznama nudi enake zmožnosti.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="873"/>
-      <source>Error: Unable to locate zip from</source>
-      <translation>Napaka: Ni mogoče najti zipa od</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="319"/>
-      <source>Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path</source>
-      <translation>Pri pridobivanju Git makra se je nekje zalomilo. Najverjetneje Git-ove izvršljive datoteke ni na tej poti</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="559"/>
-      <source>This addon is marked as Python 2 Only</source>
-      <translation>Ta dodatek je označen, da je le za Python 2</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="564"/>
-      <source>This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use.</source>
-      <translation>To delovno okolje lahko ni več vzdrževano in namestitev v Python 3 okolje bo najverjetneje prinesla napake pri zagonu ali med delovanjem.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="727"/>
-      <source>User requested updating a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Uporabnik je zaprosil posodobitev Python 2 delovnega okolja na okolje, ki se izvaja v Pythonu 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="763"/>
-      <source>Workbench successfully updated. Please restart FreeCAD to apply the changes.</source>
-      <translation>Delovno okolje je uspešno posodobljeno. Za uveljavitev sprememb ponovno zaženite FreeCAD.</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="771"/>
-      <source>User requested installing a Python 2 workbench on a system running Python 3 - </source>
-      <translation>Uporabnik je zaprosil namestitev Python 2 delovnega okolja na okolje, ki se izvaja v Pythonu 3 - </translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="343"/>
-      <source>Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time</source>
-      <translation>Kaže, da je težava v povezavi z Wiki, zaradi česa trenutno ni mogoče pridobiti seznama Wiki makrov</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="433"/>
-      <source>Raw markdown displayed</source>
-      <translation>Prikazan surov Markdown</translation>
-    </message>
-    <message>
-      <location filename="addonmanager_workers.py" line="435"/>
-      <source>Python Markdown library is missing.</source>
-      <translation>Knjižnica Python Markdowna manjka.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Dialog</name>
-    <message>
-      <location filename="AddonManager.ui" line="37"/>
-      <source>Workbenches</source>
-      <translation>Delovna okolja</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="47"/>
-      <source>Macros</source>
-      <translation>Makri</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="59"/>
-      <source>Execute</source>
-      <translation>Izvedi</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="113"/>
-      <source>Downloading info...</source>
-      <translation>Prenašanje podatkov ...</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="150"/>
-      <source>Update all</source>
-      <translation>Posodobi vse</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="56"/>
-      <source>Executes the selected macro, if installed</source>
-      <translation>Izvedi izbrani makro, če je nameščen</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="127"/>
-      <source>Uninstalls a selected macro or workbench</source>
-      <translation>Odnamesti izbrani makro ali delovno okolje</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="137"/>
-      <source>Installs or updates the selected macro or workbench</source>
-      <translation>Namesti ali posodobi izbrani makro ali delovno okolje</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="147"/>
-      <source>Download and apply all available updates</source>
-      <translation>Prenesi in uporabi vse razpoložljive posodobitve</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="35"/>
-      <source>Custom repositories (one per line):</source>
-      <translation>Skladišča po meri (eno na vrstico):</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="89"/>
-      <source>Sets configuration options for the Addon Manager</source>
-      <translation>Nastavi konfiguracijske možnosti za Upravljalnik dodatkov</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="92"/>
-      <source>Configure...</source>
-      <translation>Nastavi ...</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="14"/>
-      <source>Addon manager options</source>
-      <translation>Možnosti upravljalnika dodatkov</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="130"/>
-      <source>Uninstall selected</source>
-      <translation>Odstrani izbrano</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="140"/>
-      <source>Install/update selected</source>
-      <translation>Namesti/posodobi izbrano</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="160"/>
-      <source>Close</source>
-      <translation>Zapri</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="20"/>
-      <source>If this option is selected, when launching the Addon Manager,
-installed addons will be checked for available updates
-(this requires the GitPython package installed on your system)</source>
-      <translation>Če je ta možnost izbrana, bo pri zagonu upravljalnika dodatkov
-za nameščene dodatke preverjena razpoložljivost posodobitev
-(potrebna je nameščenost paketa GitPython v vašem okolju)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="25"/>
-      <source>Automatically check for updates at start (requires GitPython)</source>
-      <translation>Samodejno preverjanje za posodobitve ob zagonu (potreben GitPython)</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="57"/>
-      <source>Proxy </source>
-      <translation>Posredniški strežnik </translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="64"/>
-      <source>No proxy</source>
-      <translation>Ni posredniškega strežnika</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="71"/>
-      <source>User system proxy</source>
-      <translation>Posredniški strežnik uporabniškega okolja</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="78"/>
-      <source>User defined proxy :</source>
-      <translation>Posredniški strežnik, ki ga določi uporabnik:</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="14"/>
-      <source>Addon Manager</source>
-      <translation>Upravljalnik dodatkov</translation>
-    </message>
-    <message>
-      <location filename="AddonManager.ui" line="157"/>
-      <source>Close the Addon Manager</source>
-      <translation>Zapri upravljalnik dodatkov</translation>
-    </message>
-    <message>
-      <location filename="AddonManagerOptions.ui" line="42"/>
-      <source>You can use this window to specify additional addon repositories
-to be scanned for available addons</source>
-      <translation>To okno lahko uporabite za določanje dodatnih skladišč dodatkov,
-v katerih se preišče za morebitno razpoložljive dodatke</translation>
+      <location filename="addonmanager_macro.py" line="164"/>
+      <source>Unable to retrieve a description for this macro.</source>
+      <translation>Opisa tega makra ni mogoče pridobiti.</translation>
     </message>
   </context>
   <context>
@@ -424,4 +305,138 @@ v katerih se preišče za morebitno razpoložljive dodatke</translation>
       <translation>Upravljaj z zunanjimi delovnimi okolji in makri</translation>
     </message>
   </context>
+  <context>
+    <name>Dialog</name>
+    <message>
+      <location filename="../../AddonManager.ui" line="14"/>
+      <source>Addon Manager</source>
+      <translation>Upravljalnik dodatkov</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="37"/>
+      <source>Workbenches</source>
+      <translation>Delovna okolja</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="47"/>
+      <source>Macros</source>
+      <translation>Makri</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="56"/>
+      <source>Executes the selected macro, if installed</source>
+      <translation>Izvedi izbrani makro, če je nameščen</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="59"/>
+      <source>Execute</source>
+      <translation>Izvedi</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="89"/>
+      <source>Sets configuration options for the Addon Manager</source>
+      <translation>Nastavi konfiguracijske možnosti za Upravljalnik dodatkov</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="92"/>
+      <source>Configure...</source>
+      <translation>Nastavi ...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="113"/>
+      <source>Downloading info...</source>
+      <translation>Prenašanje podatkov ...</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="127"/>
+      <source>Uninstalls a selected macro or workbench</source>
+      <translation>Odnamesti izbrani makro ali delovno okolje</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="130"/>
+      <source>Uninstall selected</source>
+      <translation>Odstrani izbrano</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="137"/>
+      <source>Installs or updates the selected macro or workbench</source>
+      <translation>Namesti ali posodobi izbrani makro ali delovno okolje</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="140"/>
+      <source>Install/update selected</source>
+      <translation>Namesti/posodobi izbrano</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="147"/>
+      <source>Download and apply all available updates</source>
+      <translation>Prenesi in uporabi vse razpoložljive posodobitve</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="150"/>
+      <source>Update all</source>
+      <translation>Posodobi vse</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="157"/>
+      <source>Close the Addon Manager</source>
+      <translation>Zapri upravljalnik dodatkov</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManager.ui" line="160"/>
+      <source>Close</source>
+      <translation>Zapri</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="14"/>
+      <source>Addon manager options</source>
+      <translation>Možnosti upravljalnika dodatkov</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="20"/>
+      <source>If this option is selected, when launching the Addon Manager,
+installed addons will be checked for available updates
+(this requires the GitPython package installed on your system)</source>
+      <translation>Če je ta možnost izbrana, bo pri zagonu upravljalnika dodatkov
+za nameščene dodatke preverjena razpoložljivost posodobitev
+(potrebna je nameščenost paketa GitPython v vašem okolju)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="25"/>
+      <source>Automatically check for updates at start (requires GitPython)</source>
+      <translation>Samodejno preverjanje za posodobitve ob zagonu (potreben GitPython)</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="35"/>
+      <source>Custom repositories (one per line):</source>
+      <translation>Skladišča po meri (eno na vrstico):</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="42"/>
+      <source>You can use this window to specify additional addon repositories
+to be scanned for available addons</source>
+      <translation>To okno lahko uporabite za določanje dodatnih skladišč dodatkov,
+v katerih se preišče za morebitno razpoložljive dodatke</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="57"/>
+      <source>Proxy </source>
+      <translation>Posredniški strežnik </translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="64"/>
+      <source>No proxy</source>
+      <translation>Ni posredniškega strežnika</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="71"/>
+      <source>User system proxy</source>
+      <translation>Posredniški strežnik uporabniškega okolja</translation>
+    </message>
+    <message>
+      <location filename="../../AddonManagerOptions.ui" line="78"/>
+      <source>User defined proxy :</source>
+      <translation>Posredniški strežnik, ki ga določi uporabnik:</translation>
+    </message>
+  </context>
 </TS>