summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2017-03-04 07:21:17 -0500
committerPliable Pixels <pliablepixels@gmail.com>2017-03-04 07:21:17 -0500
commit44ae012e2cdc8d673bc47e71a55cb3f8e4a6e235 (patch)
treebdce3186695cf96f09c84d87c6f78e2466f3b545
parente9af25f32d72a2146796c9eea3224c1d9c882ce9 (diff)
parent3ea0fb36a8c0da5f076fb380affef8d59301bd2a (diff)
Merge branch 'master' of github.com:pliablepixels/zmNinja
-rw-r--r--www/lang/locale-fr.json3
-rw-r--r--www/lang/locale-pl.json1
2 files changed, 3 insertions, 1 deletions
diff --git a/www/lang/locale-fr.json b/www/lang/locale-fr.json
index b1b35096..c7751676 100644
--- a/www/lang/locale-fr.json
+++ b/www/lang/locale-fr.json
@@ -76,8 +76,9 @@
"kEnableGIFMP4" :"Activer les téléchargements GIF/MP4",
"kEnableLogs" :"Activer les logs",
"kEnableNewsUpdates" :"Activer les mises à jour",
- "kEnableStrictSSL" :"Activer la vérification SSL stricte",
"kEnterPin" :"Saisir le code PIN",
+ "kEnableSlowLoading" :"Utiliser des timeouts HTTP élevés",
+ "kEnableStrictSSL" :"Activer la vérification SSL stricte",
"kError" :"Erreur",
"kErrorChangingMonitors" :"Impossible de changer de caméra. Vérifiez les logs",
"kErrorFrameBanner" :"Impossible de récupérer les détails de l'image",
diff --git a/www/lang/locale-pl.json b/www/lang/locale-pl.json
index ae34df40..ab106518 100644
--- a/www/lang/locale-pl.json
+++ b/www/lang/locale-pl.json
@@ -77,6 +77,7 @@
"kEnableLogs" :"Włącz dziennik",
"kEnableNewsUpdates" :"Włącz informację o aktualizacji",
"kEnterPin" :"Wprowadź PIN",
+ "kEnableSlowLoading" :"Użyj dużych opóźnień HTTP",
"kEnableStrictSSL" :"Włącz rygorystyczne sprawdzanie SSL",
"kError" :"Błąd",
"kErrorChangingMonitors" :"Błąd zmiany monitorów. Proszę sprawdzić logi",