summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/js/DataModel.js2
-rw-r--r--www/lang/locale-en.json2
-rw-r--r--www/templates/devoptions.html2
-rw-r--r--www/templates/help.html2
-rw-r--r--www/templates/login.html2
5 files changed, 6 insertions, 4 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index b0754ef9..5a837039 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -1775,7 +1775,7 @@ angular.module('zmApp.controllers')
if (!loadingStr)
{
- loadingStr = "loading events...";
+ loadingStr = $translate.instant('kLoadingEvents')+"...";
}
//if (loadingStr) loa
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",
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 1f70d412..2c373418 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -4,7 +4,7 @@
<button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
</ion-nav-buttons>
<ion-nav-buttons side="right">
- <button class="button button-clear" ng-click="saveDevOptions()">Save</button>
+ <button class="button button-clear" ng-click="saveDevOptions()">{{'kSave' | translate}}</button>
</ion-nav-buttons>
<ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<div class="list list-inset">
diff --git a/www/templates/help.html b/www/templates/help.html
index d14085be..c0f714cf 100644
--- a/www/templates/help.html
+++ b/www/templates/help.html
@@ -1,4 +1,4 @@
-<ion-view cache-view="false" view-title="Help">
+<ion-view cache-view="false" view-title="{{'kHelp' | translate}}">
<ion-nav-buttons side="left">
<button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
<button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
diff --git a/www/templates/login.html b/www/templates/login.html
index 28e340e8..9372aae0 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -5,7 +5,7 @@
<button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge" ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
</ion-nav-buttons>
<ion-nav-buttons side="right">
- <button class="button button-clear" ng-click="saveItems()">Save</button>
+ <button class="button button-clear" ng-click="saveItems()">{{'kSave' | translate}}</button>
</ion-nav-buttons>
<ion-content scroll-sista delegate-handle="none" overflow-scroll="false" mouse-wheel-scroll>
<div class="item item-text-wrap item-input-inset">