Merge branch 'master' of https://github.com/domoticz/domoticz

Author: dnpwwo

History.txt

@@ -118,6 +118,9 @@ Version 2.xxx (xxxx 2015)
 - Implemented: Dummy Hardware, Ampere Single (single ampere value, other ampere sensor expects 3 values)
 - Implemented: Settings/Log, option to clear all short-log data
 - Implemented: Settings/Backup/Restore, when performing a database backup/restore the database is cleaned
+- Implemented: Hebrew translation (big thanks to mickeyv!!)
+- Implemented: Arabic translation (big thanks to Mo7sen!!)
+
 
 Version 2.2563 (June 14th 2015)
 - Implemented: WebServer, native SSL and keep-alive, big thanks to chimit!!!!

appveyor.yml

@@ -15,3 +15,15 @@ build_script:
 
 artifacts:
 - path: domoticz-*-setup.zip
+
+deploy:
+- provider: FTP
+  host: 62.84.241.110
+  protocol: ftps
+  username: uploads@domoticz.com
+  password:
+    secure: GgWxZgJZT1AvNQvCd0XhUg==
+  artifact: domoticz-*-setup.zip
+  on:
+    APPVEYOR_REPO_NAME: domoticz/domoticz
+    APPVEYOR_REPO_BRANCH: master

main/WebServer.cpp

@@ -68,14 +68,16 @@ struct _tGuiLanguage {
 static const _tGuiLanguage guiLanguage[] =
 {
 	{ "en", "English" },
+	{ "ar", "Arabic" },
 	{ "bg", "Bulgarian" },
 	{ "cs", "Czech" },
-	{ "nl", "Dutch" },
 	{ "da", "Danish" },
+	{ "nl", "Dutch" },
 	{ "de", "German" },
 	{ "el", "Greek" },
 	{ "fr", "French" },
 	{ "fi", "Finnish" },
+	{ "he", "Hebrew" },
 	{ "hu", "Hungarian" },
 	{ "it", "Italian" },
 	{ "lt", "Lithuanian" },

www/html5.appcache

@@ -393,15 +393,17 @@ secpanel/sounds/wrong.mp3
 secpanel/sounds/wrong.ogg
 
 # Languages
+i18n/domoticz-ar.json
 i18n/domoticz-bg.json
 i18n/domoticz-cs.json
 i18n/domoticz-da.json
 i18n/domoticz-de.json
+i18n/domoticz-el.json
 i18n/domoticz-en.json
 i18n/domoticz-es.json
-i18n/domoticz-el.json
 i18n/domoticz-fi.json
 i18n/domoticz-fr.json
+i18n/domoticz-he.json
 i18n/domoticz-hu.json
 i18n/domoticz-it.json
 i18n/domoticz-lt.json