From f0ec391af778f6a152b52b68e31b496fb5053aba Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 10 Nov 2016 15:00:43 -0500 Subject: timezone API check fix plus error handling for unplayable videos --- www/lang/locale-en.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index d9e70a12..5e9d032c 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -339,6 +339,8 @@ "kVersionIncompatible" :"I am incompatible with your ZoneMinder version", "kVibrateOnPush" :"Vibrate on push", "kVideo" :"Video", + "kVideoError" : "Video not playable.", + "kVideoErrorMobile" : "Video not playable. Try enabling 'force image path for events' in Dev Settings. The format may also be incompatible with a mobile system view", "kWake" :"Wake", "kWarningLargeTimeline" :"A large value can affect timeline performance. If you find timeline performance slow, try reducing the value to 200 and work your way up from there.", "kWeek" :"Week", -- cgit v1.2.3 From ca963710c3d05f193c1f7cc0f3a45d6df0ae032f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 11 Nov 2016 10:57:48 -0500 Subject: Added warning to turn of auto-correct during config in zmNinja #367 --- www/lang/locale-en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 5e9d032c..78175511 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -61,6 +61,7 @@ "kDisableNative" :"Disable Native transitions", "kDisableNativeSub" :"Enable if the menu is freezing", "kDisablePush" :"disable APNS/GCM", + "kDisableSamsung" :"If you are on a samsung device and are facing input issues, please temporarily disable auto-correction", "kDiscovering" :"discovering", "kDiscoveringAPI" :"discovering api", "kDiscoveringCGI" :"discovering cgi", -- cgit v1.2.3 From 6bd5f2a707ccf5aec245b7ba56fbbfb46ffd2994 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 15 Nov 2016 15:59:15 -0500 Subject: addresses #371 --- www/lang/locale-en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 78175511..6e999e49 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -210,6 +210,7 @@ "kNoMonitors" :"No monitors to display", "kNoMoreEvents" :"no more events", "kNormalPlay" :"normal play", + "kNow" :"now", "kOff" :"off", "kOn" :"on", "kOnTapNavigate" :"on tap, navigate to", -- cgit v1.2.3 From 9dc36815cdf21287a597842d6653b3f652f5d85c Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 18 Nov 2016 16:33:07 -0500 Subject: Experimental and initial version - still has work to go - #379 --- www/lang/locale-en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 6e999e49..fe6e82e2 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -67,6 +67,7 @@ "kDiscoveringCGI" :"discovering cgi", "kDiscoveringPortal" :"discovering portal", "kDone" :"done", + "kDownload" :"download", "kEnable24hr" :"enable 24hr time format", "kEnableDebug" :"Enable debug logs", "kEnableLogs" :"Enable logs", -- cgit v1.2.3 From 4a973a83e0790cfee3fdc0dd46efd7ce71283b41 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 22 Nov 2016 12:25:58 -0400 Subject: tweaks to video loading display and other cleanup #381 --- www/lang/locale-en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index fe6e82e2..008d5e06 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -344,6 +344,7 @@ "kVideo" :"Video", "kVideoError" : "Video not playable.", "kVideoErrorMobile" : "Video not playable. Try enabling 'force image path for events' in Dev Settings. The format may also be incompatible with a mobile system view", + "kVideoLoading" : "Loading Video", "kWake" :"Wake", "kWarningLargeTimeline" :"A large value can affect timeline performance. If you find timeline performance slow, try reducing the value to 200 and work your way up from there.", "kWeek" :"Week", -- cgit v1.2.3 From d90a9534c04299c7eedefaf4388801722562ad09 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 23 Nov 2016 16:24:56 -0400 Subject: updates for #379 and #383 - you will now see both an MP4 and a GIF icon. MP4 will show only if you are on desktop and using 264 branch --- www/lang/locale-en.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 008d5e06..cb302ed6 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -211,6 +211,7 @@ "kNoMonitors" :"No monitors to display", "kNoMoreEvents" :"no more events", "kNormalPlay" :"normal play", + "kNote" : "Note", "kNow" :"now", "kOff" :"off", "kOn" :"on", @@ -345,6 +346,7 @@ "kVideoError" : "Video not playable.", "kVideoErrorMobile" : "Video not playable. Try enabling 'force image path for events' in Dev Settings. The format may also be incompatible with a mobile system view", "kVideoLoading" : "Loading Video", + "kVideoMp4Warning" : "It is currently not possible to know when video is fully downloaded. Please track file size of download.", "kWake" :"Wake", "kWarningLargeTimeline" :"A large value can affect timeline performance. If you find timeline performance slow, try reducing the value to 200 and work your way up from there.", "kWeek" :"Week", -- cgit v1.2.3 From e3bbbf419adae4f391c786d94db4acd7b88a0355 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 26 Nov 2016 14:39:41 -0500 Subject: various updates to video downloads, including device compatibility (android) #383 --- www/lang/locale-en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index cb302ed6..646a153d 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -129,6 +129,7 @@ "kFrom" :"From", "kFromDate" :"From Date", "kFromTime" :"From Time", + "kGifWarning" :"The GIF animation will only be of alarmed frames and limited to 70 frames, due to memory constraints", "kGlobalConfiguration" :"Global Configuration", "kGraphAlarmed" :"alarmed", "kGraphAll" :"all", -- cgit v1.2.3 From 76ed15b904463247bcd799b0116380ee4a1ddb6d Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 28 Nov 2016 14:03:13 -0500 Subject: modifications for picking up feeds from new zmNinja medium blog --- www/lang/locale-en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 646a153d..9dbbd1c8 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -204,7 +204,7 @@ "kMore" :"more", "kNeedToKnow" :"I need to know your ZoneMinder login and path details to get started", "kNegotiatingStreamAuth" :"negotiating stream authentication", - "kNews" :"News", + "kNews" :"News (latest 10)", "kNext" :"Next", "kNextEvent" :"next event", "kNextMonitor" :"next monitor", -- cgit v1.2.3 From eb4dcce4167444cc856ed904c23d4417365dd0e8 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 30 Nov 2016 15:40:32 -0500 Subject: major rewrite of GIF creation - memory handling much better #398 - moved to Stream based support --- www/lang/locale-en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 9dbbd1c8..ca200f17 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -129,7 +129,7 @@ "kFrom" :"From", "kFromDate" :"From Date", "kFromTime" :"From Time", - "kGifWarning" :"The GIF animation will only be of alarmed frames and limited to 70 frames, due to memory constraints", + "kGifWarning" :"The GIF animation will only be of alarmed frames and 1fps", "kGlobalConfiguration" :"Global Configuration", "kGraphAlarmed" :"alarmed", "kGraphAll" :"all", -- cgit v1.2.3 From 724fec3a208e7f42ed9e657740484b3b6be9f27e Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 2 Dec 2016 11:45:22 -0500 Subject: if running crosswalk, disable this feature (doesn't work) #398 --- www/lang/locale-en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index ca200f17..af191d83 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -130,6 +130,7 @@ "kFromDate" :"From Date", "kFromTime" :"From Time", "kGifWarning" :"The GIF animation will only be of alarmed frames and 1fps", + "kGifNoCrosswalk" : "Sorry, you need to be on Android 5.0 (Lollipop) or above for this feature to work.", "kGlobalConfiguration" :"Global Configuration", "kGraphAlarmed" :"alarmed", "kGraphAll" :"all", -- cgit v1.2.3 From 89ade3c9f048bbda108948d89de3c2b9c0d4a0ed Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 3 Dec 2016 07:17:36 -0500 Subject: fixed hardcoded strings, except 'Back' #400 --- www/lang/locale-en.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index af191d83..67ad0ca4 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -136,6 +136,7 @@ "kGraphAll" :"all", "kGraphError" :"there was an error rendering the graph. Please see logs", "kH264VideoSupport" :"H264 Video support", + "kHelp" : "Help", "kHideMonsWithoutEvents" :"Hide monitors without events", "kHideTip" :"hide tip", "kHighBWDisplay" :"high bandwidth", @@ -154,6 +155,7 @@ "kLiveView" :"Live View", "kLoad" :"load", "kLoading" :"loading", + "kLoadingEvents" : "loading events", "kLoadingGraph" :"loading graph", "kLoadingMonitors" :"loading monitors", "kLocalTimeZone" :"use local timezone", -- cgit v1.2.3 From 38dc473ddd6494ad5b60062b757f8d11009a7886 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 3 Dec 2016 08:53:51 -0500 Subject: fixed blog check date and also internationlized "new post" text --- www/lang/locale-en.json | 1 + 1 file changed, 1 insertion(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 67ad0ca4..951edb38 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -208,6 +208,7 @@ "kNeedToKnow" :"I need to know your ZoneMinder login and path details to get started", "kNegotiatingStreamAuth" :"negotiating stream authentication", "kNews" :"News (latest 10)", + "kNewPost" : "new post", "kNext" :"Next", "kNextEvent" :"next event", "kNextMonitor" :"next monitor", -- cgit v1.2.3 From e82f80b46ada10cd83f2e0faf28a2281a27ec533 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 6 Dec 2016 10:24:53 -0500 Subject: multiple montage profile support added #390 --- www/lang/locale-en.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 951edb38..33ecc8a8 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -203,6 +203,9 @@ "kMonitors" :"Monitors", "kMontage" :"Montage", "kMontageImageScale" :"Montage image scale", + "kMontageNoSavedProfiles" :"No saved montage profiles", + "kMontageSave" :"Save Montage Profile", + "kMontageSaveSubtitle" :"please enter a profile name to save current settings", "kMonth" :"Month", "kMore" :"more", "kNeedToKnow" :"I need to know your ZoneMinder login and path details to get started", @@ -284,6 +287,7 @@ "kSearch" :"search", "kSearchCancelled" :"search cancelled", "kSec" :"sec", + "kSelect" :"Please Select", "kSelectFallback" :"Select fallback", "kSelectLanguage" :"Select Language", "kSelectRunState" :"Select run state", -- cgit v1.2.3 From ae491ab2d29738a1da7f046e520cc2e61e9d4206 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 6 Dec 2016 15:57:04 -0500 Subject: added subtitle text to popups #390 --- www/lang/locale-en.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 33ecc8a8..769631ba 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -288,6 +288,8 @@ "kSearchCancelled" :"search cancelled", "kSec" :"sec", "kSelect" :"Please Select", + "kSelectDelete" :"Selected profile will be deleted", + "kSelectSwitch" :"Selected profile will be loaded", "kSelectFallback" :"Select fallback", "kSelectLanguage" :"Select Language", "kSelectRunState" :"Select run state", -- cgit v1.2.3