Merge branch 'pulls/23'

.travis.yml

@@ -0,0 +1,26 @@
+language: cpp
+
+compiler:
+  - gcc
+
+sudo: required
+dist: trusty
+
+env:
+  - QT_BASE=56
+
+before_install:
+  - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt56-trusty -y; fi
+  - sudo apt-get update -qq
+
+install:
+  - if [ "$QT_BASE" = "56" ]; then sudo apt-get install -qq qt56base qt56script qt56tools ; source /opt/qt56/bin/qt56-env.sh; fi
+  
+
+script:
+  - qmake -r
+  - make
+  - make check
+
+notifications:
+  email: false

README.md

@@ -1,4 +1,9 @@
-# LimeReport v1.3.10
+LimeReport v1.3.10    [![Build Status](https://travis-ci.org/newsages/LimeReport.svg?branch=master)](https://travis-ci.org/newsages/LimeReport)
+-----------
+-----------
+
+
+
 ##Features
 * Multi-platform support
 * Pure Qt4/Qt5 compatible code
@@ -16,6 +21,7 @@
 * A Smart band split moving data to the next page
 * PDF output
 
+
 ##How to use it
 1. Build limereport.pro. It will create a limereport shared library  
 2. In your project connect the limereport library then in source code add:

translations/limereport_es_ES.ts

@@ -649,6 +649,21 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::PreviewReportWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PDF file name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Report file name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::PreviewReportWindow</name>
     <message>
@@ -731,14 +746,6 @@ p, li { white-space: pre-wrap; }
         <source> of %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Report file name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PDF file name</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LimeReport::ProxyHolder</name>

translations/limereport_ru.ts

@@ -800,6 +800,21 @@ p, li { white-space: pre-wrap; }
         <translation>Верхний колонтитул</translation>
     </message>
 </context>
+<context>
+    <name>LimeReport::PreviewReportWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PDF file name</source>
+        <translation type="unfinished">Имя PDF файла</translation>
+    </message>
+    <message>
+        <source>Report file name</source>
+        <translation type="unfinished">Файл отчета</translation>
+    </message>
+</context>
 <context>
     <name>LimeReport::PreviewReportWindow</name>
     <message>
@@ -876,11 +891,11 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Report file name</source>
-        <translation type="unfinished">Файл отчета</translation>
+        <translation type="obsolete">Файл отчета</translation>
     </message>
     <message>
         <source>PDF file name</source>
-        <translation type="unfinished">Имя PDF файла</translation>
+        <translation type="obsolete">Имя PDF файла</translation>
     </message>
     <message>
         <source>Preview</source>