Merge remote-tracking branch 'origin/master' into Develop

# Conflicts:
#	TrackYourTime/data/cexternaltrackers.cpp
#	TrackYourTime/ui/app_settingswindow.cpp

BUILD_README.md

@@ -1,27 +1,45 @@
 
-For building this application, Qt 5 is required
+For building this application, Qt 5 is required  
 
-You can get it here: https://www.qt.io/download/
+You can get it here: https://www.qt.io/download/  
 
-First build TrackYourTime.pro with Qt Creator - it is a typical Qt project
+First build TrackYourTime.pro with Qt Creator - it is a typical Qt project  
 
-After building do the following:
+After building do the following:  
 
 #Windows
 
-Place TrackYourTime.exe in build folder, copy data folder, 
-copy platforms plugin with qwindows, copy necessary qt libs
-Pack in compressed folder TrackYourTime_Windows.zip
+Place TrackYourTime.exe in build folder, copy data folder,   
+copy platforms plugin with qwindows, copy necessary qt libs  
+Pack in compressed folder TrackYourTime_Windows.zip  
 
 #Mac OS X
 
-Copy data into TrackYourTime.app/Contents/MacOS
+Copy data into TrackYourTime.app/Contents/MacOS  
 copy platforms/libqcocoa.dylib into TrackYourTime.app/Contents/PlugIns/platforms
 add key LSUIElement with value 1 into TrackYourTime.app/Contents/Info.plist
-execute macdeployqt with -dmg flag
+execute macdeployqt with -dmg flag(<path_to_qt/macdeployqt TrackYourTime.app -dmg>)
 Rename package to TrackYourTime_MacOSX.dmg
 
 #Linux
 Place TrackYourTime in build folder, 
 copy data folder, copy checksystem
 Pack into TrackYourTime_Linux.tar.gz
+
+
+#Localization  
+its possible to make this work from console without QtCreator.  
+But QtCreator is simple and powerfull tool and i prefer to use it.  
+
+Open project in QtCreator  
+Go to menu Tools->External->Linguist->Update Translations(lupdate)  
+Launch Qt Linguist(<qt_path/bin/linguist>)  
+Open *.ts file for edit  
+Edit file(edit item and press Ctrl+Enter)
+Save file  
+Go to menu Tools->External->Linguist->Release Translations(lrelease)  
+Move *.qm file into data/languages
+
+If you create new language  - create file with name data/languages/lang_<lang_id>_name.utf8  
+Open this file in utf8 text editor  
+And place only one line in utd8 encoding - name of language in native format  

TrackYourTime/TrackYourTime.pro

@@ -32,7 +32,7 @@ mac:ICON = main.icns
 win32:LIBS += -luser32
 unix:!mac:LIBS += -lX11
 
-INCLUDEPATH += "ui"
+INCLUDEPATH += ui data tools
 
 SOURCES += \
     main.cpp \

TrackYourTime/data/cdbversionconverter.cpp

@@ -110,7 +110,9 @@ bool convertToVersion2(const QString& SrcFileName,const QString& DstFileName, bo
             if (makeBackup)
                 QFile::rename(DstFileName,DstFileName+".version.2");
             QFile::rename(tmpFileName,DstFileName);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
             qInfo() << "db converted from version 1 to version 2";
+#endif
         }
         return success;
     }

TrackYourTime/ui/app_settingswindow.cpp

@@ -10,7 +10,9 @@ App_SettingsWindow::App_SettingsWindow(cDataManager *DataManager) :
     ui->setupUi(this);    
     m_DataManager = DataManager;
 
-    ui->plainTextEditScript->setPlaceholderText(tr("Place title parser code here. Look predefined scripts for example."));
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
+    ui->plainTextEditScript->setPlaceholderText("Place title parser code here. Look predefined scripts for example.");
+#endif
     connect(ui->pushButtonApply,SIGNAL(released()),this,SLOT(onApply()));
     connect(ui->pushButtonStartDebug,SIGNAL(released()),this,SLOT(onSetDebug()));
 }