diff options
| author | steelyard-nl <email@jeroenkik.nl> | 2017-02-02 10:23:17 +0100 |
|---|---|---|
| committer | steelyard-nl <email@jeroenkik.nl> | 2017-02-02 10:23:17 +0100 |
| commit | f09ddff0fa5d8b1eaadedee578c415a808afe9c5 (patch) | |
| tree | 28bfa85de536b191acf8317ecfd1864044a6c162 /www/lang | |
| parent | 75cd89cad9414f13e06ab2783867d39e5dc1f1ba (diff) | |
| parent | 9a74711e529ee3a44ee09456de81e29b780238fe (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/master' into 440-Hard-coded-text-found-
# Conflicts:
# www/templates/timeline.html
Diffstat (limited to 'www/lang')
| -rw-r--r-- | www/lang/locale-en.json | 3 | ||||
| -rwxr-xr-x | www/lang/locale-nl.json | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 41d5a6f6..ca495a5a 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -10,6 +10,7 @@ "kAll" :"All", "kAnalyze" :"Analyze", "kApiUrl" :"ZM api url", + "kApiUrlExample" :"e.g. server/zm/api", "kApplyingChanges" :"Applying changes. Please wait", "kArrangingImages" :"arranging images", "kAt" :"at", @@ -241,6 +242,7 @@ "kPTZnotConfigured" :"PTZ not configured for this monitor", "kPassword" :"password", "kPathToCgi" :"path to cgi-bin", + "kPathToCgiExample" :"e.g. server/zm/cgi-bin", "kPause" :"pause", "kPaused" :"paused", "kPersistHidden" :"Persist hidden monitors", @@ -268,6 +270,7 @@ "kPortalNoticeSub" :"(Swipe right to access the menu)", "kPortalPleaseSelect" :"Please select", "kPortalUrl" :"ZM portal url", + "kPortalUrlExample" :"e.g. server/zm", "kPresets" :"presets", "kPrev" :"Prev", "kPrevEvent" :"prev. event", diff --git a/www/lang/locale-nl.json b/www/lang/locale-nl.json index 529db990..94b3e32b 100755 --- a/www/lang/locale-nl.json +++ b/www/lang/locale-nl.json @@ -10,6 +10,7 @@ "kAll" :"Alles", "kAnalyze" :"Analyseer", "kApiUrl" :"ZM api url", + "kApiUrlExample" :"bijv. server/zm/api", "kApplyingChanges" :"Veranderingen toepassen. Even geduld", "kArrangingImages" :"afbeeldingen rangschikken", "kAt" :"op", @@ -241,6 +242,7 @@ "kPTZnotConfigured" :"PTZ niet geconfigureerd voor deze monitori", "kPassword" :"Wachtwoord", "kPathToCgi" :"map naar cgi-bin", + "kPathToCgiExample" :"bijv. server/zm/cgi-bin", "kPause" :"pauze", "kPaused" :"onderbroken", "kPersistHidden" :"Aanhoudend verborgen monitoren", @@ -268,6 +270,7 @@ "kPortalNoticeSub" :"(Swipe rechts voor menu toegang)", "kPortalPleaseSelect" :"Maak selectie", "kPortalUrl" :"ZM portaal url", + "kPortalUrlExample" :"bijv. server/zm", "kPresets" :"voorinstellingen", "kPrev" :"Vorige", "kPrevEvent" :"vorige gebeurtenis", |