From 8fe3b06d40b0c052ba915fb76874e1d02b04c5bb Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sun, 1 Oct 2017 07:45:55 -0400
Subject: updates

---
 .DS_Store               | Bin 12292 -> 14340 bytes
 CHANGELOG.md            |  23 +++++++++++++++++++++++
 config.xml              |  10 +++++-----
 package.json            |   6 +++---
 resources/icon.ico      | Bin 0 -> 10218 bytes
 www/lang/checklang.py   |   6 +++---
 www/lang/locale-en.json |   2 +-
 7 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 resources/icon.ico

diff --git a/.DS_Store b/.DS_Store
index 1108cbd9..1b2c2ad8 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b78026..f095fae5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Change Log
 
+## [1.2.503](https://github.com/pliablepixels/zmNinja/tree/1.2.503) (2017-10-01)
+[Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.44...1.2.503)
+
+**Implemented enhancements:**
+
+- Allow running multiple, different instances of zmNinja \(desktop\) [\#542](https://github.com/pliablepixels/zmNinja/issues/542)
+- Abstract zmNinja out from ZM specifics [\#318](https://github.com/pliablepixels/zmNinja/issues/318)
+
+**Fixed bugs:**
+
+- German language - JSON corrupted -affects 1.2.500 [\#545](https://github.com/pliablepixels/zmNinja/issues/545)
+
+**Closed issues:**
+
+- make it easier to make desktop builds [\#541](https://github.com/pliablepixels/zmNinja/issues/541)
+- Explore upgrading electron wrapper to solve white screen issues [\#539](https://github.com/pliablepixels/zmNinja/issues/539)
+- All monitors view refresh rate 0 or very low on my PC/Windows installation of ZMNinja [\#527](https://github.com/pliablepixels/zmNinja/issues/527)
+
+**Merged pull requests:**
+
+- Email not configured [\#544](https://github.com/pliablepixels/zmNinja/pull/544) ([florie1706](https://github.com/florie1706))
+- kEmailNotConfigured [\#540](https://github.com/pliablepixels/zmNinja/pull/540) ([maymaymay](https://github.com/maymaymay))
+
 ## [v1.2.44](https://github.com/pliablepixels/zmNinja/tree/v1.2.44) (2017-09-25)
 [Full Changelog](https://github.com/pliablepixels/zmNinja/compare/v1.2.41...v1.2.44)
 
diff --git a/config.xml b/config.xml
index c8dc04d0..07efaa8b 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.502" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninjapro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.2.503" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
@@ -95,6 +95,9 @@
     </platform>
     <icon src="resources/android/icon/drawable-xhdpi-icon.png" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
+    <engine name="android" spec="^6.2.3" />
+    <engine name="ios" spec="^4.4.0" />
+    <plugin name="com.jcjee.plugins.emailcomposer" spec="https://github.com/pliablepixels/email-composer" />
     <plugin name="com.telerik.plugins.nativepagetransitions" spec="^0.6.5" />
     <plugin name="cordova-library-helper" spec="^1.0.4">
         <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="Save media to your Camera Roll" />
@@ -125,6 +128,7 @@
     <plugin name="cordova-plugin-pin-dialog" spec="^0.1.3" />
     <plugin name="cordova-plugin-settings-hook" spec="^0.2.7" />
     <plugin name="cordova-plugin-splashscreen" spec="^4.0.3" />
+    <plugin name="cordova-plugin-statusbar" spec="git+https://github.com/apache/cordova-plugin-statusbar.git" />
     <plugin name="cordova-plugin-touchid" spec="^0.4.0" />
     <plugin name="cordova-plugin-websocket" spec="^0.12.2" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.2" />
@@ -137,8 +141,4 @@
     <plugin name="phonegap-plugin-push" spec="^1.10.5">
         <variable name="SENDER_ID" value="710936220256" />
     </plugin>
-    <engine name="ios" spec="~4.4.0" />
-    <engine name="android" spec="~6.2.3" />
-    <plugin name="com.jcjee.plugins.emailcomposer" spec="https://github.com/pliablepixels/email-composer" />
-    <plugin name="cordova-plugin-statusbar" spec="https://github.com/apache/cordova-plugin-statusbar" />
 </widget>
diff --git a/package.json b/package.json
index bd461f1c..bf909f54 100644
--- a/package.json
+++ b/package.json
@@ -49,9 +49,9 @@
             "phonegap-plugin-push": {
                 "SENDER_ID": "710936220256"
             },
-            "cordova-plugin-certificates": {},
             "com.jcjee.plugins.emailcomposer": {},
-            "cordova-plugin-statusbar": {}
+            "cordova-plugin-statusbar": {},
+            "cordova-plugin-certificates": {}
         }
     },
     "dependencies": {
@@ -100,4 +100,4 @@
     "devDependencies": {
         "bower": "^1.8.2"
     }
-}
+}
\ No newline at end of file
diff --git a/resources/icon.ico b/resources/icon.ico
new file mode 100644
index 00000000..e7b66565
Binary files /dev/null and b/resources/icon.ico differ
diff --git a/www/lang/checklang.py b/www/lang/checklang.py
index 307f51df..c2ddc189 100755
--- a/www/lang/checklang.py
+++ b/www/lang/checklang.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from __future__ import absolute_import, division, print_function, unicode_literals
 import sys
-import json
+import simplejson as json
 import os
 import getopt
 
@@ -53,8 +53,8 @@ def compare(fname):
   with open (i) as json_data:
       try:
         newKeys = json.load(json_data)
-      except ValueError:
-        print('could not parse %s, skipping!' %fname)
+      except ValueError as err:
+        print('could not parse %s, skipping! %s' %(fname, err))
         globBad+=1
         return
       json_data.close()
diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
index 24f2a031..a134e923 100644
--- a/www/lang/locale-en.json
+++ b/www/lang/locale-en.json
@@ -72,7 +72,7 @@
     "kDiscoveringPortal"         :"discovering portal",
     "kDone"                      :"done",
     "kDownload"                  :"download",
-    "kEmailNotConfigured"        : "Email not configured",
+    "kEmailNotConfigured"        :"Email not configured",
     "kEnable24hr"                :"enable 24hr time format",
     "kEnableDebug"               :"Enable debug logs",
     "kEnableGIFMP4"              :"Enable GIF/MP4 downloads",
-- 
cgit v1.2.3