From a84ed1903f9ebd2d7e0c31543fe90e222126c668 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 16 Oct 2018 14:52:49 -0400 Subject: menu option to toggle event summary (iPhoneX ui interference) --- 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 b30f2d23..a774e866 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -351,6 +351,7 @@ "kStatus" :"Status", "kStop" :"Stop", "kSuccess" :"Success", + "kToggleSummary" :"toggle summary", "kSwitchingEvents" :"switching events", "kSystemStatus" :"System Status", "kTapEvents" :"Events", -- cgit v1.2.3 From bf0ef4d5f85e3c30f9890a8264ed8203e19c465f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 23 Oct 2018 16:42:31 -0400 Subject: new keys for monitor status --- www/lang/locale-en.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index a774e866..d18e3ccb 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -218,6 +218,9 @@ "kMonMocord" :"Mocord", "kMonModect" :"Modect", "kMonMonitor" :"Monitor", + "kMonStreamingURL" :"Streaming url", + "kMonPortalURL" :"Portal url", + "kMonRecordingURL" :"Recording url", "kMonNodect" :"Nodect", "kMonNone" :"None", "kMonPreAlarm" :"pre-alarm", -- cgit v1.2.3 From 2ab37cf8e468fddf658897f6ef9c6391f8784b8f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 27 Oct 2018 07:51:57 -0400 Subject: modified sensitive info warning, removed old text from language files. Authors have to readd it --- 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 d18e3ccb..b1c062c8 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -331,7 +331,7 @@ "kSelectRunState" :"Select run state", "kSelectSwitch" :"Selected profile will be loaded", "kSendingPTZ" :"Sending PTZ", - "kSensitiveBody" :"will modify the logs when creating the final output to remove sensitive data like urls and passwords. However it is eventually your responsibility to make sure there is no sensitive data in the logs. Please make sure you review and edit the logs before you send it out", + "kSensitiveBody" :"*** Before you send the logs, please make sure you remove any sensitive information. zmNinja tries to filter out passwords, but its possible that passwords will be included if you include them in URLs, for example ***", "kSensitiveTitle" :"Sensitive Information", "kServerAdd" :"Add", "kServerEmptyError" :"Server Name cannot be empty", -- cgit v1.2.3 From dc113c2cfae14dbd7f71d160948f6a366cf0c9ba Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 28 Oct 2018 15:40:38 -0400 Subject: typo --- 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 b1c062c8..41292397 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -331,7 +331,7 @@ "kSelectRunState" :"Select run state", "kSelectSwitch" :"Selected profile will be loaded", "kSendingPTZ" :"Sending PTZ", - "kSensitiveBody" :"*** Before you send the logs, please make sure you remove any sensitive information. zmNinja tries to filter out passwords, but its possible that passwords will be included if you include them in URLs, for example ***", + "kSensitiveBody" :"*** Before you send the logs, please make sure you remove any sensitive information. zmNinja tries to filter out passwords, but it is possible that passwords will be included if you include them in URLs, for example ***", "kSensitiveTitle" :"Sensitive Information", "kServerAdd" :"Add", "kServerEmptyError" :"Server Name cannot be empty", -- cgit v1.2.3 From d630c9aebdf9425caca52f3c447b628d563beb0d Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 29 Oct 2018 09:17:54 -0400 Subject: removed old "force image path" error --- www/lang/locale-en.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 41292397..fa97e5c5 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -391,8 +391,7 @@ "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", + "kVideoError" :"Video not playable", "kVideoLoading" :"Loading Video", "kVideoMp4Warning" :"It is currently not possible to know when video is fully downloaded. Please track file size of download.", "kWarningBasicAuth" :"Basic auth may interfere with live streaming. Please read FAQ", -- cgit v1.2.3 From d5e7a99c63213ad3b62a9e8e95cb57f0bb0c7e6a Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 29 Oct 2018 10:45:16 -0400 Subject: desktop logs rework --- 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 fa97e5c5..100329b0 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -77,6 +77,7 @@ "kDismiss" : "Dismiss", "kDone" :"done", "kDownload" :"Download", + "kTapDownloadLogs" : "Tap the button to download logs", "kDownloadVideoImage" : "Tap the button below to download. If you are downloading a video, there is no progress indication, so please monitor file size", "kEmailNotConfigured" :"Email not configured", "kEnable24hr" :"enable 24hr time format", -- cgit v1.2.3 From 836f2d1c187047c8c6f4182c91a8ffb48d7c0de6 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 29 Oct 2018 16:52:27 -0400 Subject: #733 initial rough in --- www/lang/locale-en.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 100329b0..82d58859 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -352,6 +352,15 @@ "kStateAreYouSure" :"Are you sure you want to ", "kStateHideControls" :"Hide ZoneMinder Controls", "kStateShowControls" :"Show ZoneMinder Controls", + "kStateStorage" :"Storage", + "kStateServer" :"Server", + "kStatePath" :"Path", + "kStateHost" :"Host", + "kStateDiskUsed" :"Disk Used", + "kStateCpuLoad" :"CPU Load", + "kStateTotalMem" :"Total Memory", + "kStateFreeMem" :"Free Memory", + "kScheme" :"Scheme", "kStatus" :"Status", "kStop" :"Stop", "kSuccess" :"Success", -- cgit v1.2.3 From bbbf935e2abd9b603a090c594d09ea91d7a92f6e Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 30 Oct 2018 11:21:39 -0400 Subject: #733 other cleanup --- 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 82d58859..076e80a6 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -353,6 +353,7 @@ "kStateHideControls" :"Hide ZoneMinder Controls", "kStateShowControls" :"Show ZoneMinder Controls", "kStateStorage" :"Storage", + "kStateMultiServer" :"multi server", "kStateServer" :"Server", "kStatePath" :"Path", "kStateHost" :"Host", -- cgit v1.2.3 From 510b9e0b70c538a4ae84b428046ad519e2e7f6b5 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 30 Oct 2018 11:22:33 -0400 Subject: #733 sorting --- www/lang/locale-en.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'www/lang/locale-en.json') diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 076e80a6..123a3445 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -18,7 +18,7 @@ "kAuthHashDisabled" :" AUTH_HASH_LOGINS needs to be enabled to display images. Please restart ZM afer enabling it.", "kAuthSuccess" :"authentication success", "kAuthenticating" :"authenticating", - "kAuthenticatingWebScrape" : "authenticating via web scrape", + "kAuthenticatingWebScrape" :"authenticating via web scrape", "kAutoSwitchBW" :"auto switch bandwidth", "kAwake1" :"Keep display on", "kAwake2" :"(when viewing footage)", @@ -52,7 +52,7 @@ "kCycleMonitorsInterval" :"monitor cycle interval", "kCycleMontageInterval" :"montage cycle interval", "kDataPrivacy" :"Data Privacy", - "kDataPrivacyZM" : "zmNinja will not function properly till your process ZoneMinder's Privacy Policy. Please open ZoneMinder web console and accept or reject it.", + "kDataPrivacyZM" :"zmNinja will not function properly till your process ZoneMinder's Privacy Policy. Please open ZoneMinder web console and accept or reject it.", "kDay" :"Day", "kDecreaseSize" :"decrease size", "kDelete" :"Delete", @@ -74,11 +74,10 @@ "kDiscoveringAPI" :"discovering api", "kDiscoveringCGI" :"discovering cgi", "kDiscoveringPortal" :"discovering portal", - "kDismiss" : "Dismiss", + "kDismiss" :"Dismiss", "kDone" :"done", "kDownload" :"Download", - "kTapDownloadLogs" : "Tap the button to download logs", - "kDownloadVideoImage" : "Tap the button below to download. If you are downloading a video, there is no progress indication, so please monitor file size", + "kDownloadVideoImage" :"Tap the button below to download. If you are downloading a video, there is no progress indication, so please monitor file size", "kEmailNotConfigured" :"Email not configured", "kEnable24hr" :"enable 24hr time format", "kEnableDebug" :"Enable debug logs", @@ -219,13 +218,13 @@ "kMonMocord" :"Mocord", "kMonModect" :"Modect", "kMonMonitor" :"Monitor", - "kMonStreamingURL" :"Streaming url", - "kMonPortalURL" :"Portal url", - "kMonRecordingURL" :"Recording url", "kMonNodect" :"Nodect", "kMonNone" :"None", + "kMonPortalURL" :"Portal url", "kMonPreAlarm" :"pre-alarm", "kMonRecord" :"record", + "kMonRecordingURL" :"Recording url", + "kMonStreamingURL" :"Streaming url", "kMonitorSingleImageScale" :"Live view single image scale", "kMonitors" :"Monitors", "kMontage" :"Montage", @@ -301,8 +300,8 @@ "kProfileChangeNotification" :"You have changed from {{oldName}} to {{newName}}. Please save this profile first", "kProtect" :"protect", "kPullToReload" :"pull to reload data", - "kReachabilityFailed" : "primary login failed, trying fallbacks", "kReAuthenticating" :"re-authenticating", + "kReachabilityFailed" :"primary login failed, trying fallbacks", "kRecaptcha" :"Looks like you have enabled reCaptcha. It needs to be turned off for the app to work", "kReconfirmPin" :"Reconfirm PIN", "kRecordingProgress" :"recording in progress", @@ -316,10 +315,11 @@ "kResumeDelay" :"resume delay", "kRetrievingProfileData" :"retrieving profile data", "kSave" :"Save", - "kSavingSnapshot" :"saving snapshot", "kSaveToCloud" :"sync with cloud", - "kSaveToCloudIOS" :"saves settings to your personal iCloud account. May take several hours to sync", "kSaveToCloudANDROID" :"saves settings via Android's Backup Service. May take several hours to sync", + "kSaveToCloudIOS" :"saves settings to your personal iCloud account. May take several hours to sync", + "kSavingSnapshot" :"saving snapshot", + "kScheme" :"Scheme", "kScore" :"score", "kScrub" :"Scrub", "kSearch" :"search", @@ -350,24 +350,23 @@ "kSpeed" :"speed", "kStart" :"Start", "kStateAreYouSure" :"Are you sure you want to ", + "kStateCpuLoad" :"CPU Load", + "kStateDiskUsed" :"Disk Used", + "kStateFreeMem" :"Free Memory", "kStateHideControls" :"Hide ZoneMinder Controls", - "kStateShowControls" :"Show ZoneMinder Controls", - "kStateStorage" :"Storage", + "kStateHost" :"Host", "kStateMultiServer" :"multi server", - "kStateServer" :"Server", "kStatePath" :"Path", - "kStateHost" :"Host", - "kStateDiskUsed" :"Disk Used", - "kStateCpuLoad" :"CPU Load", + "kStateServer" :"Server", + "kStateShowControls" :"Show ZoneMinder Controls", + "kStateStorage" :"Storage", "kStateTotalMem" :"Total Memory", - "kStateFreeMem" :"Free Memory", - "kScheme" :"Scheme", "kStatus" :"Status", "kStop" :"Stop", "kSuccess" :"Success", - "kToggleSummary" :"toggle summary", "kSwitchingEvents" :"switching events", "kSystemStatus" :"System Status", + "kTapDownloadLogs" :"Tap the button to download logs", "kTapEvents" :"Events", "kTapLiveMonitor" :"Live Monitor", "kTapMontage" :"Montage", @@ -385,6 +384,7 @@ "kToDate" :"To Date", "kToTime" :"To Time", "kToastSearchingPage" :"searching page ", + "kToggleSummary" :"toggle summary", "kTrue" :"true", "kTrying" :"trying", "kType" :"type", -- cgit v1.2.3