Merge branch 'dev'

PanicInitiative · Jun 7, 2014 · 4a79c95 · 4a79c95
2 parents f2b9eee + 19b60c5
commit 4a79c95
Show file tree

Hide file tree

Showing 33 changed files with 733 additions and 351 deletions.
diff --git a/assets/help_pt.json b/assets/help_pt.json
diff --git a/assets/mobile_en.json b/assets/mobile_en.json
@@ -1,6 +1,6 @@
 {
   "mobile": {
-    "version" : 6,
+    "version" : 7,
     "data":[
     {
       "id" : "setup-warning",
@@ -46,7 +46,6 @@
       "introduction" : "Try now! Hold down any button on the calculator.",
       "component" : "disguise-test-unlock",
       "timers" : {"info":"0","inactive":"10","fail":"20"},
-      "action" : [{"title":"Skip","link":"setup-disguise-test-code"}],
       "success" : {"link":"setup-disguise-test-code"},
       "fail" : {"link":"setup-disguise-test-unlock-fail"}
     },
@@ -78,7 +77,7 @@
       "fail" : {"link":"setup-disguise-test-open-fail"}
     },
     {
-      "id" : "setup-disguise-test-unlock-fail",
+      "id" : "setup-disguise-test-code-fail",
       "lang" : "en",
       "type" : "simple",
       "title" : "Setup the Disguise",

diff --git a/assets/mobile_es.json b/assets/mobile_es.json
@@ -1,6 +1,6 @@
 {
   "mobile": {
-    "version" : 6,
+    "version" : 7,
     "data":[
     {
       "id" : "setup-warning",
@@ -28,7 +28,7 @@
       "title" : "Configuraciones de lenguage",
       "introduction" : "Selecciona un lenguaje para la aplicación.",
       "component" : "language",
-      "action" : [{"title":"Inglés","language":"en","confirmation":"New language applied"},{"title":"Español","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Francés","language":"fr","confirmation":"Nouveau language selectionné"}]
+      "action" : [{"title":"English","language":"en","confirmation":"New language applied"},{"title":"Español","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Français","language":"fr","confirmation":"Nouveau language selectionné"},{"title":"Português","language":"pt","confirmation":"Novo idioma aplicado"}]
     },
     {
       "id" : "setup-disguise-test-unlock-fail",
@@ -46,7 +46,6 @@
       "introduction" : "¡Inténtalo ahora! Mantén presionado cualquier botón de la calculadora. ",
       "component" : "disguise-test-unlock",
       "timers" : {"info":"0","inactive":"10","fail":"20"},
-      "action" : [{"title":"Skip","link":"setup-disguise-test-code"}],
       "success" : {"link":"setup-disguise-test-code"},
       "fail" : {"link":"setup-disguise-test-unlock-fail"}
     },
@@ -230,7 +229,7 @@
       "title" : "Configuraciones de Lenguage",
       "introduction" : "Selecciona un lenguaje para la aplicación.",
       "component" : "language",
-      "action" : [{"title":"Inglés","language":"en","confirmation":"New language applied"},{"title":"Español","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Francés","language":"fr","confirmation":"Nouveau language selectionné"}]
+      "action" : [{"title":"English","language":"en","confirmation":"New language applied"},{"title":"Español","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Français","language":"fr","confirmation":"Nouveau language selectionné"},{"title":"Português","language":"pt","confirmation":"Novo idioma aplicado"}]
     },
     {
       "id" : "settings-contacts",
@@ -240,15 +239,15 @@
       "introduction" : "Estas son las personas que recibirán tu alerta.",
       "warning" : "Estas personas deberán de conocerte personalmente y ser capaces de responder rápidamente.",
       "component" : "contacts",
-      "action" : [{"title":"Guardar","link":"home-ready","confirmation":"Nueva clave guardada"}],
+      "action" : [{"title":"Guardar","link":"home-ready","confirmation":"Contacts saved"}],
       "content" : "<p>Tips de seguridad</p><ul><li>Piensa acerca de quién puede ayudarte de manera práctica- No tiene caso que alguien se entere que estás en problemas si no puede ayudarte</li><li>Diseña un plan con tus contactos seleccionados para que puedan estar preparados y actuar rápidamente </li><li>Considera los riesgos- ¿Cómo es que tu contacto podría ponerse en riesgo?</li></ul>"
     },
     {
       "id" : "settings-code",
       "lang" : "es",
       "type" : "interactive",
       "title" : "Crea tu clave de acceso",
-      "introduction" : "Esta clave es necesaria para acceder a las configuraciones de la aplicación. No se necesita para enviar alerta a tus contactos en caso de emergencia. ¡Recuerda tu clave! Si la olvidas necesitarás re-instalar la aplicación.",
+      "introduction" : "Esta clave es necesaria para acceder a las configuraciones de la aplicación. No se necesita para enviar alerta a tus contactos en caso de emergencia.\n¡Recuerda tu clave! Si la olvidas necesitarás re-instalar la aplicación.\n",
       "component" : "code",
       "action" : [{"title":"Guardar","link":"home-ready","confirmation":"Tu clave ha sido guardada"}]
     },

diff --git a/assets/mobile_fr.json b/assets/mobile_fr.json
@@ -15,7 +15,7 @@
       "lang" : "fr",
       "type" : "interactive",
       "title" : "Configurer le message d'alerte",
-      "introduction" : "C'est le message qui sera envoyé avec votre position géographique.",
+      "introduction" : "Voici le message qui sera envoyé avec votre position géographique.",
       "warning" : "Veillez à ce que vos contacts sachent ce qu'ils ont à faire s'ils reçoivent ce message.",
       "component" : "message",
       "action" : [{"title":"Suivant","link":"setup-code"}],
@@ -28,7 +28,7 @@
       "title" : "Langue",
       "introduction" : "Sélectionner une langue pour l'application.",
       "component" : "language",
-      "action" : [{"title":"Anglais","language":"en","confirmation":"New language applied"},{"title":"Espagnol","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Français","language":"fr","confirmation":"Nouveau language selectionné"}]
+      "action" : [{"title":"English","language":"en","confirmation":"New language applied"},{"title":"Español","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Français","language":"fr","confirmation":"Nouveau language selectionné"},{"title":"Português","language":"pt","confirmation":"Novo idioma aplicado"}]
     },
     {
       "id" : "setup-disguise-test-unlock-fail",
@@ -46,7 +46,6 @@
       "introduction" : "Essayez ! Appuyez sur n'importe quel bouton de la calculatrice.",
       "component" : "disguise-test-unlock",
       "timers" : {"info":"0","inactive":"10","fail":"20"},
-      "action" : [{"title":"Passer","link":"setup-disguise-test-code"}],
       "success" : {"link":"setup-disguise-test-code"},
       "fail" : {"link":"setup-disguise-test-unlock-fail"}
     },
@@ -217,7 +216,7 @@
       "lang" : "fr",
       "type" : "interactive",
       "title" : "Configurer le message d'alerte",
-      "introduction" : "C'est le message qui sera envoyé avec votre position géographique.",
+      "introduction" : "Voici le message qui sera envoyé avec votre position géographique.",
       "warning" : "Veillez à ce que vos contacts sachent ce qu'ils ont à faire s'ils reçoivent ce message.",
       "component" : "message",
       "action" : [{"title":"Enregistrer","link":"home-ready","confirmation":"Message sauvegardé"}],
@@ -230,7 +229,7 @@
       "title" : "Langue",
       "introduction" : "Sélectionner une langue pour l'application.",
       "component" : "language",
-      "action" : [{"title":"Anglais","language":"en","confirmation":"New language applied"},{"title":"Espagnol","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Français","language":"fr","confirmation":"Nouveau language selectionné"}]
+      "action" : [{"title":"English","language":"en","confirmation":"New language applied"},{"title":"Español","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Français","language":"fr","confirmation":"Nouveau language selectionné"},{"title":"Português","language":"pt","confirmation":"Novo idioma aplicado"}]
     },
     {
       "id" : "settings-contacts",
@@ -276,7 +275,7 @@
       "title" : "Bouton d'urgence",
       "status" : [{"title":"Prêt","color":"green","link":"help-ready"}],
       "action" : [{"title":"Cacher","link":"checklist"}],
-      "items" : [{"title":"Paramètres","link":"settings"},{"title":"A propos","link":"setup-about"},{"title":"Aide","link":"help"}],
+      "items" : [{"title":"Paramètres","link":"settings"},{"title":"À propos","link":"setup-about"},{"title":"Aide","link":"help"}],
       "content" : "<p>Le Bouton d’urgence est désormais installé et prêt à être utilisé en cas de danger. Appuyez sur « cacher » pour quitter et cacher l’application.</p>"
     },
     {

diff --git a/assets/mobile_ph.json b/assets/mobile_ph.json
@@ -1,6 +1,6 @@
 {
   "mobile": {
-    "version" : 6,
+    "version" : 7,
     "data":[
     {
       "id" : "setup-warning",
@@ -28,7 +28,7 @@
       "title" : "Language settings",
       "introduction" : "Choose a language for the application.",
       "component" : "language",
-      "action" : [{"title":"Inglés","language":"en"},{"title":"Español","language":"es"},{"title":"Francés","language":"fr"}]
+      "action" : [{"title":"English","language":"en","confirmation":"New language applied"},{"title":"Español","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Français","language":"fr","confirmation":"Nouveau language selectionné"},{"title":"Português","language":"pt","confirmation":"Novo idioma aplicado"}]
     },
     {
       "id" : "setup-disguise-test-unlock-fail",
@@ -46,7 +46,6 @@
       "introduction" : "Try now! Hold down any button on the calculator.",
       "component" : "disguise-test-unlock",
       "timers" : {"info":"0","inactive":"10","fail":"20"},
-      "action" : [{"title":"Skip","link":"setup-disguise-test-code"}],
       "success" : {"link":"setup-disguise-test-code"},
       "fail" : {"link":"setup-disguise-test-unlock-fail"}
     },
@@ -222,7 +221,7 @@
       "title" : "Language settings",
       "introduction" : "Choose a language for the application.",
       "component" : "language",
-      "action" : [{"title":"Inglés","language":"en"},{"title":"Español","language":"es"},{"title":"Francés","language":"fr"}]
+      "action" : [{"title":"English","language":"en","confirmation":"New language applied"},{"title":"Español","language":"es","confirmation":"Nuevo lenguaje seleccionado"},{"title":"Français","language":"fr","confirmation":"Nouveau language selectionné"},{"title":"Português","language":"pt","confirmation":"Novo idioma aplicado"}]
     },
     {
       "id" : "settings-contacts",
@@ -243,7 +242,7 @@
       "introduction" : "This pincode is needed to access the app settings. It is not needed to alert in an emergency.",
       "warning" : "Remember your pin! If you forget it you will need to reinstall the app.",
       "component" : "code",
-      "action" : [{"title":"Guardar","link":"home-ready"}]
+      "action" : [{"title":"Save","link":"home-ready"}]
     },
     {
       "id" : "settings",
@@ -305,7 +304,7 @@
       "id" : "code",
       "lang" : "ph",
       "type" : "interactive",
-      "title" : "Código",
+      "title" : "Code",
       "component" : "code",
       "action" : [{"title":"Go","link":"home-ready"}],
       "fail" : "If you have forgotten your pin number, please completely uninstall the application and reinstall it."
@@ -318,6 +317,6 @@
       "action" : [{"title":"OK","link":"close"},{"title":"Cancel","link":"home-ready","status":"disabled"}],
       "checklist" : [{"title":"The application will be disguised"},{"title":"Review security plan and update trusted contacts regularly"},{"title":"Test setting off the alarm to ensure it is working"},{"title":"Ensure sufficient credit on the phone"},{"title":"Activate GPS (if you want to enable location tracking)"},{"title":"Charge phone battery to full"}],
       "content" : "<p>More <a href=\"#help-charge\">security tips...</a></p>"
-    }]
+    },]
   }
 }