Finish 1.4.56

# Conflicts: # translations/limereport_ar.ts # translations/limereport_es_ES.ts
2024-12-24 08:34:38 +03:00 · 2017-12-10 22:22:57 +03:00 · 2017-12-10 22:22:57 +03:00 · 1c2439f39b
commit 1c2439f39b
parent c41201c5b3 316b3eff7c
8 changed files with 606 additions and 25 deletions
--- a/common.pri
+++ b/common.pri
@ -70,7 +70,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc

 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 55
+LIMEREPORT_VERSION_RELEASE = 56

 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
--- a/limereport/items/lrsubitemparentpropitem.cpp
+++ b/limereport/items/lrsubitemparentpropitem.cpp
@ -48,8 +48,8 @@ namespace{

 LimeReport::ItemLocationPropItem::ItemLocationPropItem(QObject* object, ObjectsList* objects, const QString &name, const QString &displayName, const QVariant &value, ObjectPropItem* parent, bool readonly)
  :LimeReport::ObjectPropItem(object, objects, name, displayName, value, parent, readonly){
-    m_locationMap.insert("Band",LimeReport::ItemDesignIntf::Band);
-    m_locationMap.insert("Page",LimeReport::ItemDesignIntf::Page);
+    m_locationMap.insert(tr("Band"),LimeReport::ItemDesignIntf::Band);
+    m_locationMap.insert(tr("Page"),LimeReport::ItemDesignIntf::Page);
 }


--- a/limereport/objectinspector/propertyItems/lrenumpropitem.cpp
+++ b/limereport/objectinspector/propertyItems/lrenumpropitem.cpp
@ -54,10 +54,10 @@ QWidget *EnumPropItem::createProperyEditor(QWidget *parent) const
    QStringList enumValues;
    QMetaEnum propEnum = object()->metaObject()->property(object()->metaObject()->indexOfProperty(propertyName().toLatin1())).enumerator();
    for (int i=0;i<propEnum.keyCount();i++){
-        if (m_acceptableValues.isEmpty()) enumValues.append(propEnum.key(i));
+        if (m_acceptableValues.isEmpty()) enumValues.append(tr(propEnum.key(i)));
        else {
            if (m_acceptableValues.contains(propEnum.value(i))){
-                enumValues.append(propEnum.key(i));
+                enumValues.append(tr(propEnum.key(i)));
            }
        }
    }
@ -75,6 +75,65 @@ void EnumPropItem::slotEnumChanged(const QString &text)
    }
 }

+void EnumPropItem::initTranslation()
+{
+    QMetaEnum propEnum = object()->metaObject()->property(object()->metaObject()->indexOfProperty(propertyName().toLatin1())).enumerator();
+    for (int i=0;i<propEnum.keyCount();i++){
+        m_translation.insert(QString(tr(propEnum.key(i))), QString(propEnum.key(i)));
+    }
+}
+
+void EnumPropItem::translateEnumItemName()
+{
+    tr("Default");
+    tr("Portrait");
+    tr("Landscape");
+    tr("NoneAutoWidth");
+    tr("MaxWordLength");
+    tr("MaxStringLength");
+    tr("TransparentMode");
+    tr("OpaqueMode");
+    tr("Angle0");
+    tr("Angle90");
+    tr("Angle180");
+    tr("Angle270");
+    tr("Angle45");
+    tr("Angle315");
+    tr("DateTime");
+    tr("Double");
+    tr("NoBrush");
+    tr("SolidPattern");
+    tr("Dense1Pattern");
+    tr("Dense2Pattern");
+    tr("Dense3Pattern");
+    tr("Dense4Pattern");
+    tr("Dense5Pattern");
+    tr("Dense6Pattern");
+    tr("Dense7Pattern");
+    tr("HorPattern");
+    tr("VerPattern");
+    tr("CrossPattern");
+    tr("BDiagPattern");
+    tr("FDiagPattern");
+    tr("LeftToRight");
+    tr("RightToLeft");
+    tr("LayoutDirectionAuto");
+    tr("LeftItemAlign");
+    tr("RightItemAlign");
+    tr("CenterItemAlign");
+    tr("ParentWidthItemAlign");
+    tr("DesignedItemAlign");
+    tr("HorizontalLine");
+    tr("VerticalLine");
+    tr("Ellipse");
+    tr("Rectangle");
+    tr("Page");
+    tr("Band");
+    tr("Horizontal");
+    tr("Vertical");
+    tr("VerticalUniform");
+}
+
 void EnumPropItem::setPropertyEditorData(QWidget *propertyEditor, const QModelIndex &) const
 {
    ComboBoxEditor *editor=qobject_cast<ComboBoxEditor *>(propertyEditor);
@ -90,13 +149,13 @@ void EnumPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mod
 QString EnumPropItem::nameByType(int value) const
 {
    QMetaEnum propEnum = object()->metaObject()->property(object()->metaObject()->indexOfProperty(propertyName().toLatin1())).enumerator();
-    return propEnum.valueToKey(value);
+    return tr(propEnum.valueToKey(value));
 }

 int EnumPropItem::typeByName(const QString &value) const
 {
    QMetaEnum propEnum = object()->metaObject()->property(object()->metaObject()->indexOfProperty(propertyName().toLatin1())).enumerator();
-    return propEnum.keyToValue(value.toLatin1());
+    return propEnum.keyToValue(m_translation.value(value).toLatin1());
 }

 QString EnumPropItem::displayValue() const
--- a/limereport/objectinspector/propertyItems/lrenumpropitem.h
+++ b/limereport/objectinspector/propertyItems/lrenumpropitem.h
@ -31,17 +31,18 @@
 #define LRENUMPROPITEM_H

 #include "lrobjectpropitem.h"
+#include <QMap>

 namespace LimeReport{
 class EnumPropItem : public ObjectPropItem
 {
    Q_OBJECT
 public:
-    EnumPropItem():ObjectPropItem(), m_settingValue(false){}
+    EnumPropItem():ObjectPropItem(), m_settingValue(false){initTranslation();}
    EnumPropItem(QObject* object, ObjectsList* objects, const QString& name, const QString& displayName, const QVariant& value,ObjectPropItem* parent, bool readonly)
-        :ObjectPropItem(object, objects, name, displayName, value, parent, readonly),m_settingValue(false){}
+        :ObjectPropItem(object, objects, name, displayName, value, parent, readonly),m_settingValue(false){initTranslation();}
    EnumPropItem(QObject* object, ObjectsList* objects, const QString& name, const QString& displayName, const QVariant& value,ObjectPropItem* parent, bool readonly, QVector<int> acceptableValues)
-        :ObjectPropItem(object, objects, name, displayName, value, parent, readonly),m_acceptableValues(acceptableValues),m_settingValue(false){}
+        :ObjectPropItem(object, objects, name, displayName, value, parent, readonly),m_acceptableValues(acceptableValues),m_settingValue(false){initTranslation();}
    QWidget*    createProperyEditor(QWidget *parent) const;
    QString     displayValue() const;
    void        setPropertyEditorData(QWidget * propertyEditor, const QModelIndex &) const;
@ -52,9 +53,13 @@ protected:
    int     typeByName(const QString& propertyValue) const;
 private slots:
    void slotEnumChanged(const QString& text);
+private:
+    void initTranslation();
+    void translateEnumItemName();
 private:
    QVector<int> m_acceptableValues;
    bool m_settingValue;
+    QMap<QString, QString> m_translation;
 };
 }
 #endif // LRENUMPROPITEM_H
--- a/limereport/objectinspector/propertyItems/lrflagspropitem.cpp
+++ b/limereport/objectinspector/propertyItems/lrflagspropitem.cpp
@ -59,12 +59,14 @@ void FlagsPropItem::createChildren()
    QMetaEnum propEnum = object()->metaObject()->property(object()->metaObject()->indexOfProperty(propertyName().toLatin1())).enumerator();
    for (int i=0;i<propEnum.keyCount();i++)
    {
-        this->appendItem(new LimeReport::FlagPropItem(
-                             object(), objects(), QString(propEnum.key(i)), QString(propEnum.key(i)),
-                             bool((propertyValue().toInt() & propEnum.keyToValue(propEnum.key(i)))==propEnum.keyToValue(propEnum.key(i))),
-                             this, false
-                             )
-                         );
+        if ( propEnum.keyToValue(propEnum.key(i)) !=0 ) {
+            this->appendItem(new LimeReport::FlagPropItem(
+                                 object(), objects(), QString(propEnum.key(i)), tr(propEnum.key(i)),
+                                 bool((propertyValue().toInt() & propEnum.keyToValue(propEnum.key(i)))==propEnum.keyToValue(propEnum.key(i))),
+                                 this, false
+                                 )
+                             );
+        }
    }
 }

@ -94,10 +96,10 @@ QString FlagsPropItem::displayValue() const
    QMetaEnum propEnum = object()->metaObject()->property(object()->metaObject()->indexOfProperty(propertyName().toLatin1())).enumerator();
    for (int i=0;i<propEnum.keyCount();i++)
    {
-        if ( (propertyValue().toInt() & propEnum.keyToValue(propEnum.key(i)))==propEnum.keyToValue(propEnum.key(i) ))
+        if ((propEnum.keyToValue(propEnum.key(i)) == 0) ? propertyValue().toInt() == 0 : (propertyValue().toInt() & propEnum.keyToValue(propEnum.key(i))) == propEnum.keyToValue(propEnum.key(i)))
        {
-            if (result.isEmpty()) result+=propEnum.key(i);
-            else result=result+" | "+propEnum.key(i);
+            if (result.isEmpty()) result+= tr(propEnum.key(i));
+            else result=result+" | "+tr(propEnum.key(i));
        }

    }
@ -114,6 +116,15 @@ void FlagsPropItem::slotEnumChanged(QString /*text*/)
 {
 }

+void FlagsPropItem::translateFlagsItem()
+{
+    tr("NoLine");
+    tr("TopLine");
+    tr("BottomLine");
+    tr("LeftLine");
+    tr("RightLine");
+}
+
 FlagPropItem::FlagPropItem(QObject* object, ObjectsList* objects, const QString &propName, const QString &displayName, const QVariant &value, ObjectPropItem* parent, bool readonly)
    :BoolPropItem(object, objects, propName,displayName,value,parent,readonly)
 {
@ -130,8 +141,8 @@ void FlagPropItem::setModelData(QWidget *propertyEditor, QAbstractItemModel *mod
    bool value = qobject_cast<CheckBoxEditor*>(propertyEditor)->isChecked();
    model->setData(index,value);
    int flags = object()->property(parent()->propertyName().toLatin1()).toInt();
-    if (value) flags=flags | valueByName(displayName());
-    else if (flags&valueByName(displayName())) flags=flags ^ valueByName(displayName());
+    if (value) flags = flags | valueByName(propertyName());
+    else if (flags & valueByName(propertyName())) flags = flags ^ valueByName(propertyName());
    setValueToObject(parent()->propertyName(),flags);
    parent()->setPropertyValue(flags);
 }
--- a/limereport/objectinspector/propertyItems/lrflagspropitem.h
+++ b/limereport/objectinspector/propertyItems/lrflagspropitem.h
@ -46,6 +46,8 @@ public:
    virtual void    setPropertyValue(QVariant propertyValue);
 private slots:
    void slotEnumChanged(QString);
+private:
+    void translateFlagsItem();
 private:
    QSet<int> m_acceptableValues;
    QString nameByType(int propertyValue) const;
--- a/translations/limereport_fr.ts
+++ b/translations/limereport_fr.ts
@ -725,6 +725,272 @@ p, li { white-space: pre-wrap; }
        <translation>Variables externe</translation>
    </message>
 </context>
+<context>
+    <name>LimeReport::EnumPropItem</name>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="88"/>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="89"/>
+        <source>Portrait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="90"/>
+        <source>Landscape</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="91"/>
+        <source>NoneAutoWidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="92"/>
+        <source>MaxWordLength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="93"/>
+        <source>MaxStringLength</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="94"/>
+        <source>TransparentMode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="95"/>
+        <source>OpaqueMode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="96"/>
+        <source>Angle0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="97"/>
+        <source>Angle90</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="98"/>
+        <source>Angle180</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="99"/>
+        <source>Angle270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="100"/>
+        <source>Angle45</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="101"/>
+        <source>Angle315</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="102"/>
+        <source>DateTime</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="103"/>
+        <source>Double</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="104"/>
+        <source>NoBrush</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="105"/>
+        <source>SolidPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="106"/>
+        <source>Dense1Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="107"/>
+        <source>Dense2Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="108"/>
+        <source>Dense3Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="109"/>
+        <source>Dense4Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="110"/>
+        <source>Dense5Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="111"/>
+        <source>Dense6Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="112"/>
+        <source>Dense7Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="113"/>
+        <source>HorPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="114"/>
+        <source>VerPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="115"/>
+        <source>CrossPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="116"/>
+        <source>BDiagPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="117"/>
+        <source>FDiagPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="118"/>
+        <source>LeftToRight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="119"/>
+        <source>RightToLeft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="120"/>
+        <source>LayoutDirectionAuto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="121"/>
+        <source>LeftItemAlign</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="122"/>
+        <source>RightItemAlign</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="123"/>
+        <source>CenterItemAlign</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="124"/>
+        <source>ParentWidthItemAlign</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="125"/>
+        <source>DesignedItemAlign</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="126"/>
+        <source>HorizontalLine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="127"/>
+        <source>VerticalLine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="128"/>
+        <source>Ellipse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="129"/>
+        <source>Rectangle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="130"/>
+        <source>Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="131"/>
+        <source>Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="132"/>
+        <source>Horizontal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="133"/>
+        <source>Vertical</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrenumpropitem.cpp" line="134"/>
+        <source>VerticalUniform</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LimeReport::FlagsPropItem</name>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrflagspropitem.cpp" line="121"/>
+        <source>NoLine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrflagspropitem.cpp" line="122"/>
+        <source>TopLine</source>
+        <translation type="unfinished">Ligne supérieur</translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrflagspropitem.cpp" line="123"/>
+        <source>BottomLine</source>
+        <translation type="unfinished">Ligne inférieur</translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrflagspropitem.cpp" line="124"/>
+        <source>LeftLine</source>
+        <translation type="unfinished">Ligne gauche</translation>
+    </message>
+    <message>
+        <location filename="../limereport/objectinspector/propertyItems/lrflagspropitem.cpp" line="125"/>
+        <source>RightLine</source>
+        <translation type="unfinished">Ligne droite</translation>
+    </message>
+</context>
 <context>
    <name>LimeReport::FontEditorWidget</name>
    <message>
@ -828,6 +1094,19 @@ p, li { white-space: pre-wrap; }
        <translation>Image</translation>
    </message>
 </context>
+<context>
+    <name>LimeReport::ItemLocationPropItem</name>
+    <message>
+        <location filename="../limereport/items/lrsubitemparentpropitem.cpp" line="51"/>
+        <source>Band</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../limereport/items/lrsubitemparentpropitem.cpp" line="52"/>
+        <source>Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>LimeReport::ItemsAlignmentEditorWidget</name>
    <message>
--- a/translations/limereport_ru.ts
+++ b/translations/limereport_ru.ts
@ -260,7 +260,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;; font-style:italic;&quot;&gt;signature of Ty Coon&lt;/span&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;;&quot;&gt;, 1 April 1990&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:15px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;monospace&apos;;&quot;&gt;Ty Coon, President of Vice&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:19px; margin-bottom:19px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;sans-serif&apos;;&quot;&gt;That&apos;s all there is to it!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
    </message>
 </context>
 <context>
@ -730,6 +730,220 @@ p, li { white-space: pre-wrap; }
        <translation>Редактор действий</translation>
    </message>
 </context>
+<context>
+    <name>LimeReport::EnumPropItem</name>
+    <message>
+        <source>Default</source>
+        <translation>По умолчанию</translation>
+    </message>
+    <message>
+        <source>Portrait</source>
+        <translation>Портретная</translation>
+    </message>
+    <message>
+        <source>Landscape</source>
+        <translation>Альбомная</translation>
+    </message>
+    <message>
+        <source>NoneAutoWidth</source>
+        <translation type="unfinished">Нет</translation>
+    </message>
+    <message>
+        <source>MaxWordLength</source>
+        <translation type="unfinished">По ширине слова</translation>
+    </message>
+    <message>
+        <source>MaxStringLength</source>
+        <translation type="unfinished">По ширине строки</translation>
+    </message>
+    <message>
+        <source>TransparentMode</source>
+        <translation>Прозрачный</translation>
+    </message>
+    <message>
+        <source>OpaqueMode</source>
+        <translation>Заливка</translation>
+    </message>
+    <message>
+        <source>Angle0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>Angle90</source>
+        <translation>90</translation>
+    </message>
+    <message>
+        <source>Angle180</source>
+        <translation>180</translation>
+    </message>
+    <message>
+        <source>Angle270</source>
+        <translation>270</translation>
+    </message>
+    <message>
+        <source>Angle45</source>
+        <translation>45</translation>
+    </message>
+    <message>
+        <source>Angle315</source>
+        <translation>315</translation>
+    </message>
+    <message>
+        <source>DateTime</source>
+        <translation>Дата и время</translation>
+    </message>
+    <message>
+        <source>Double</source>
+        <translation>Число</translation>
+    </message>
+    <message>
+        <source>NoBrush</source>
+        <translation>Нет заливки</translation>
+    </message>
+    <message>
+        <source>SolidPattern</source>
+        <translation>Сплошная заливка</translation>
+    </message>
+    <message>
+        <source>Dense1Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dense2Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dense3Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dense4Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dense5Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dense6Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dense7Pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HorPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VerPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CrossPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BDiagPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FDiagPattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LeftToRight</source>
+        <translation>С лева на право</translation>
+    </message>
+    <message>
+        <source>RightToLeft</source>
+        <translation>С права на лево</translation>
+    </message>
+    <message>
+        <source>LayoutDirectionAuto</source>
+        <translation>Авто</translation>
+    </message>
+    <message>
+        <source>LeftItemAlign</source>
+        <translation>С лева</translation>
+    </message>
+    <message>
+        <source>RightItemAlign</source>
+        <translation>С права</translation>
+    </message>
+    <message>
+        <source>CenterItemAlign</source>
+        <translation>По центру</translation>
+    </message>
+    <message>
+        <source>ParentWidthItemAlign</source>
+        <translation>По ширине родителя</translation>
+    </message>
+    <message>
+        <source>DesignedItemAlign</source>
+        <translation>Заданный положение</translation>
+    </message>
+    <message>
+        <source>HorizontalLine</source>
+        <translation>Горизонтальная линия</translation>
+    </message>
+    <message>
+        <source>VerticalLine</source>
+        <translation>Вертикальная линия</translation>
+    </message>
+    <message>
+        <source>Ellipse</source>
+        <translation>Элипс</translation>
+    </message>
+    <message>
+        <source>Rectangle</source>
+        <translation>Прямоугольник</translation>
+    </message>
+    <message>
+        <source>Page</source>
+        <translation>Страница</translation>
+    </message>
+    <message>
+        <source>Band</source>
+        <translation>Раздел</translation>
+    </message>
+    <message>
+        <source>Horizontal</source>
+        <translation>Горизонтально</translation>
+    </message>
+    <message>
+        <source>Vertical</source>
+        <translation>Вертикально</translation>
+    </message>
+    <message>
+        <source>VerticalUniform</source>
+        <translation>Вертикально равномерно</translation>
+    </message>
+</context>
+<context>
+    <name>LimeReport::FlagsPropItem</name>
+    <message>
+        <source>NoLine</source>
+        <translation>Нет границ</translation>
+    </message>
+    <message>
+        <source>TopLine</source>
+        <translation>Верхняя граница</translation>
+    </message>
+    <message>
+        <source>BottomLine</source>
+        <translation>Нижняя граница</translation>
+    </message>
+    <message>
+        <source>LeftLine</source>
+        <translation>Левая граница</translation>
+    </message>
+    <message>
+        <source>RightLine</source>
+        <translation>Правая граница</translation>
+    </message>
+</context>
 <context>
    <name>LimeReport::FontEditorWidget</name>
    <message>
@ -816,6 +1030,17 @@ p, li { white-space: pre-wrap; }
        <translation>Изображение</translation>
    </message>
 </context>
+<context>
+    <name>LimeReport::ItemLocationPropItem</name>
+    <message>
+        <source>Band</source>
+        <translation>Раздел</translation>
+    </message>
+    <message>
+        <source>Page</source>
+        <translation>Страница</translation>
+    </message>
+</context>
 <context>
    <name>LimeReport::ItemsAlignmentEditorWidget</name>
    <message>
@ -1421,7 +1646,7 @@ p, li { white-space: pre-wrap; }
    </message>
    <message>
        <source>securityLevel</source>
-        <translation type="unfinished">Уровень безопасности</translation>
+        <translation>Уровень безопасности</translation>
    </message>
    <message>
        <source>testValue</source>
@ -1429,11 +1654,11 @@ p, li { white-space: pre-wrap; }
    </message>
    <message>
        <source>whitespace</source>
-        <translation type="unfinished">Отступ</translation>
+        <translation>Отступ</translation>
    </message>
    <message>
        <source>cornerRadius</source>
-        <translation type="unfinished">Радиус закругления</translation>
+        <translation>Радиус закругления</translation>
    </message>
    <message>
        <source>shapeColor</source>