Merge pull request #1 from pliablepixels/master

updating

1 files changed, 20 insertions, 1 deletions

diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
index d9e70a12..769631ba 100644
--- a/www/lang/locale-en.json
+++ b/www/lang/locale-en.json
@@ -61,11 +61,13 @@
     "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",
     "kDiscoveringPortal"         :"discovering portal",
     "kDone"                      :"done",
+    "kDownload"                  :"download",
     "kEnable24hr"                :"enable 24hr time format",
     "kEnableDebug"               :"Enable debug logs",
     "kEnableLogs"                :"Enable logs",
@@ -127,11 +129,14 @@
     "kFrom"                      :"From",
     "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",
     "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",
@@ -150,6 +155,7 @@
     "kLiveView"                  :"Live View",
     "kLoad"                      :"load",
     "kLoading"                   :"loading",
+    "kLoadingEvents"             : "loading events",
     "kLoadingGraph"              :"loading graph",
     "kLoadingMonitors"           :"loading monitors",
     "kLocalTimeZone"             :"use local timezone",
@@ -197,11 +203,15 @@
     "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",
     "kNegotiatingStreamAuth"     :"negotiating stream authentication",
-    "kNews"                      :"News",
+    "kNews"                      :"News (latest 10)",
+    "kNewPost"                   : "new post",
     "kNext"                      :"Next",
     "kNextEvent"                 :"next event",
     "kNextMonitor"               :"next monitor",
@@ -209,6 +219,8 @@
     "kNoMonitors"                :"No monitors to display",
     "kNoMoreEvents"              :"no more events",
     "kNormalPlay"                :"normal play",
+    "kNote"                      : "Note",
+    "kNow"                       :"now",
     "kOff"                       :"off",
     "kOn"                        :"on",
     "kOnTapNavigate"             :"on tap, navigate to",
@@ -275,6 +287,9 @@
     "kSearch"                    :"search",
     "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",
@@ -339,6 +354,10 @@
     "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",
+    "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",