Skip to content
This repository was archived by the owner on Mar 27, 2020. It is now read-only.

Commit 4a79c95

Browse files
committed
Merge branch 'dev'
2 parents f2b9eee + 19b60c5 commit 4a79c95

33 files changed

+733
-351
lines changed

assets/help_pt.json

Lines changed: 232 additions & 0 deletions
Large diffs are not rendered by default.

assets/mobile_en.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"mobile": {
3-
"version" : 6,
3+
"version" : 7,
44
"data":[
55
{
66
"id" : "setup-warning",
@@ -46,7 +46,6 @@
4646
"introduction" : "Try now! Hold down any button on the calculator.",
4747
"component" : "disguise-test-unlock",
4848
"timers" : {"info":"0","inactive":"10","fail":"20"},
49-
"action" : [{"title":"Skip","link":"setup-disguise-test-code"}],
5049
"success" : {"link":"setup-disguise-test-code"},
5150
"fail" : {"link":"setup-disguise-test-unlock-fail"}
5251
},
@@ -78,7 +77,7 @@
7877
"fail" : {"link":"setup-disguise-test-open-fail"}
7978
},
8079
{
81-
"id" : "setup-disguise-test-unlock-fail",
80+
"id" : "setup-disguise-test-code-fail",
8281
"lang" : "en",
8382
"type" : "simple",
8483
"title" : "Setup the Disguise",

assets/mobile_es.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"mobile": {
3-
"version" : 6,
3+
"version" : 7,
44
"data":[
55
{
66
"id" : "setup-warning",
@@ -28,7 +28,7 @@
2828
"title" : "Configuraciones de lenguage",
2929
"introduction" : "Selecciona un lenguaje para la aplicación.",
3030
"component" : "language",
31-
"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é"}]
31+
"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"}]
3232
},
3333
{
3434
"id" : "setup-disguise-test-unlock-fail",
@@ -46,7 +46,6 @@
4646
"introduction" : "¡Inténtalo ahora! Mantén presionado cualquier botón de la calculadora. ",
4747
"component" : "disguise-test-unlock",
4848
"timers" : {"info":"0","inactive":"10","fail":"20"},
49-
"action" : [{"title":"Skip","link":"setup-disguise-test-code"}],
5049
"success" : {"link":"setup-disguise-test-code"},
5150
"fail" : {"link":"setup-disguise-test-unlock-fail"}
5251
},
@@ -230,7 +229,7 @@
230229
"title" : "Configuraciones de Lenguage",
231230
"introduction" : "Selecciona un lenguaje para la aplicación.",
232231
"component" : "language",
233-
"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é"}]
232+
"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"}]
234233
},
235234
{
236235
"id" : "settings-contacts",
@@ -240,15 +239,15 @@
240239
"introduction" : "Estas son las personas que recibirán tu alerta.",
241240
"warning" : "Estas personas deberán de conocerte personalmente y ser capaces de responder rápidamente.",
242241
"component" : "contacts",
243-
"action" : [{"title":"Guardar","link":"home-ready","confirmation":"Nueva clave guardada"}],
242+
"action" : [{"title":"Guardar","link":"home-ready","confirmation":"Contacts saved"}],
244243
"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>"
245244
},
246245
{
247246
"id" : "settings-code",
248247
"lang" : "es",
249248
"type" : "interactive",
250249
"title" : "Crea tu clave de acceso",
251-
"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.",
250+
"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",
252251
"component" : "code",
253252
"action" : [{"title":"Guardar","link":"home-ready","confirmation":"Tu clave ha sido guardada"}]
254253
},

assets/mobile_fr.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"lang" : "fr",
1616
"type" : "interactive",
1717
"title" : "Configurer le message d'alerte",
18-
"introduction" : "C'est le message qui sera envoyé avec votre position géographique.",
18+
"introduction" : "Voici le message qui sera envoyé avec votre position géographique.",
1919
"warning" : "Veillez à ce que vos contacts sachent ce qu'ils ont à faire s'ils reçoivent ce message.",
2020
"component" : "message",
2121
"action" : [{"title":"Suivant","link":"setup-code"}],
@@ -28,7 +28,7 @@
2828
"title" : "Langue",
2929
"introduction" : "Sélectionner une langue pour l'application.",
3030
"component" : "language",
31-
"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é"}]
31+
"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"}]
3232
},
3333
{
3434
"id" : "setup-disguise-test-unlock-fail",
@@ -46,7 +46,6 @@
4646
"introduction" : "Essayez ! Appuyez sur n'importe quel bouton de la calculatrice.",
4747
"component" : "disguise-test-unlock",
4848
"timers" : {"info":"0","inactive":"10","fail":"20"},
49-
"action" : [{"title":"Passer","link":"setup-disguise-test-code"}],
5049
"success" : {"link":"setup-disguise-test-code"},
5150
"fail" : {"link":"setup-disguise-test-unlock-fail"}
5251
},
@@ -217,7 +216,7 @@
217216
"lang" : "fr",
218217
"type" : "interactive",
219218
"title" : "Configurer le message d'alerte",
220-
"introduction" : "C'est le message qui sera envoyé avec votre position géographique.",
219+
"introduction" : "Voici le message qui sera envoyé avec votre position géographique.",
221220
"warning" : "Veillez à ce que vos contacts sachent ce qu'ils ont à faire s'ils reçoivent ce message.",
222221
"component" : "message",
223222
"action" : [{"title":"Enregistrer","link":"home-ready","confirmation":"Message sauvegardé"}],
@@ -230,7 +229,7 @@
230229
"title" : "Langue",
231230
"introduction" : "Sélectionner une langue pour l'application.",
232231
"component" : "language",
233-
"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é"}]
232+
"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"}]
234233
},
235234
{
236235
"id" : "settings-contacts",
@@ -276,7 +275,7 @@
276275
"title" : "Bouton d'urgence",
277276
"status" : [{"title":"Prêt","color":"green","link":"help-ready"}],
278277
"action" : [{"title":"Cacher","link":"checklist"}],
279-
"items" : [{"title":"Paramètres","link":"settings"},{"title":"A propos","link":"setup-about"},{"title":"Aide","link":"help"}],
278+
"items" : [{"title":"Paramètres","link":"settings"},{"title":"À propos","link":"setup-about"},{"title":"Aide","link":"help"}],
280279
"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>"
281280
},
282281
{

assets/mobile_ph.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"mobile": {
3-
"version" : 6,
3+
"version" : 7,
44
"data":[
55
{
66
"id" : "setup-warning",
@@ -28,7 +28,7 @@
2828
"title" : "Language settings",
2929
"introduction" : "Choose a language for the application.",
3030
"component" : "language",
31-
"action" : [{"title":"Inglés","language":"en"},{"title":"Español","language":"es"},{"title":"Francés","language":"fr"}]
31+
"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"}]
3232
},
3333
{
3434
"id" : "setup-disguise-test-unlock-fail",
@@ -46,7 +46,6 @@
4646
"introduction" : "Try now! Hold down any button on the calculator.",
4747
"component" : "disguise-test-unlock",
4848
"timers" : {"info":"0","inactive":"10","fail":"20"},
49-
"action" : [{"title":"Skip","link":"setup-disguise-test-code"}],
5049
"success" : {"link":"setup-disguise-test-code"},
5150
"fail" : {"link":"setup-disguise-test-unlock-fail"}
5251
},
@@ -222,7 +221,7 @@
222221
"title" : "Language settings",
223222
"introduction" : "Choose a language for the application.",
224223
"component" : "language",
225-
"action" : [{"title":"Inglés","language":"en"},{"title":"Español","language":"es"},{"title":"Francés","language":"fr"}]
224+
"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"}]
226225
},
227226
{
228227
"id" : "settings-contacts",
@@ -243,7 +242,7 @@
243242
"introduction" : "This pincode is needed to access the app settings. It is not needed to alert in an emergency.",
244243
"warning" : "Remember your pin! If you forget it you will need to reinstall the app.",
245244
"component" : "code",
246-
"action" : [{"title":"Guardar","link":"home-ready"}]
245+
"action" : [{"title":"Save","link":"home-ready"}]
247246
},
248247
{
249248
"id" : "settings",
@@ -305,7 +304,7 @@
305304
"id" : "code",
306305
"lang" : "ph",
307306
"type" : "interactive",
308-
"title" : "Código",
307+
"title" : "Code",
309308
"component" : "code",
310309
"action" : [{"title":"Go","link":"home-ready"}],
311310
"fail" : "If you have forgotten your pin number, please completely uninstall the application and reinstall it."
@@ -318,6 +317,6 @@
318317
"action" : [{"title":"OK","link":"close"},{"title":"Cancel","link":"home-ready","status":"disabled"}],
319318
"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"}],
320319
"content" : "<p>More <a href=\"#help-charge\">security tips...</a></p>"
321-
}]
320+
},]
322321
}
323322
}

0 commit comments

Comments
 (0)