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

Commit

Permalink
Merged dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmatsushita
jmatsushita committed May 14, 2014
2 parents 6606cb2 + 83ac306 commit 279aa67
Show file tree
Hide file tree
Showing 48 changed files with 678 additions and 788 deletions.
1 change: 1 addition & 0 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.GET_TASKS" />
Expand Down
34 changes: 17 additions & 17 deletions assets/help_es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"data":[
{
"id" : "help",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Help",
"items" : [
Expand All @@ -22,7 +22,7 @@
},
{
"id" : "help_reading",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Reading List",
"section_order" : "3",
Expand All @@ -33,7 +33,7 @@
},
{
"id" : "help_risk",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Managing Your Risks",
"heading" : "Managing Your Risks",
Expand All @@ -51,7 +51,7 @@
},
{
"id" : "help_risk_assessing",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Assessing your risk",
"heading" : "Assessing your risk",
Expand All @@ -69,7 +69,7 @@
},
{
"id" : "help_risk_assessing_threat",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Assessing the threat",
"heading" : "First step: assessing the threat",
Expand All @@ -78,7 +78,7 @@
},
{
"id" : "help_risk_assessing_vulnerability",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Reducing your vulnerability",
"heading" : "Second step: reducing your vulnerability to a threat",
Expand All @@ -87,7 +87,7 @@
},
{
"id" : "help_risk_mobile",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Safer mobile",
"heading" : "Safer mobile",
Expand All @@ -99,7 +99,7 @@
},
{
"id" : "help_using",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Using Panic Button",
"section_order" : "2",
Expand All @@ -121,7 +121,7 @@
},
{
"id" : "help_using_installation",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Installation",
"heading" : "Installation",
Expand All @@ -133,7 +133,7 @@
},
{
"id" : "help_using_configuration",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Configuration",
"heading" : "Configuration",
Expand All @@ -159,7 +159,7 @@
},
{
"id" : "help_using_configuration_contacts",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Setting Up Contacts",
"heading" : "Setting Up Contacts",
Expand All @@ -169,7 +169,7 @@
},
{
"id" : "help_using_configuration_alert_messages",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Create your alert message",
"heading" : "Create your alert message",
Expand All @@ -178,7 +178,7 @@
},
{
"id" : "help_using_configuration_code",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Create pin code",
"heading" : "Create pin code",
Expand All @@ -187,7 +187,7 @@
},
{
"id" : "help_using_configuration_alert",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Learn how to alert",
"heading" : "Learn how to alert",
Expand All @@ -196,7 +196,7 @@
},
{
"id" : "help_using_configuration_disguise",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Activate disguise",
"heading" : "Activate disguise",
Expand All @@ -205,7 +205,7 @@
},
{
"id" : "help_using_tips",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Preparing for Panic",
"heading" : "Tips for testing",
Expand All @@ -217,7 +217,7 @@
},
{
"id" : "help_using_faq",
"lang" : "en",
"lang" : "es",
"type" : "simple",
"title" : "Frequently Ask Questions",
"heading" : "Frequently Ask Questions",
Expand Down
34 changes: 17 additions & 17 deletions assets/help_fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"data":[
{
"id" : "help",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Help",
"items" : [
Expand All @@ -22,7 +22,7 @@
},
{
"id" : "help_reading",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Reading List",
"section_order" : "3",
Expand All @@ -33,7 +33,7 @@
},
{
"id" : "help_risk",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Managing Your Risks",
"heading" : "Managing Your Risks",
Expand All @@ -51,7 +51,7 @@
},
{
"id" : "help_risk_assessing",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Assessing your risk",
"heading" : "Assessing your risk",
Expand All @@ -69,7 +69,7 @@
},
{
"id" : "help_risk_assessing_threat",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Assessing the threat",
"heading" : "First step: assessing the threat",
Expand All @@ -78,7 +78,7 @@
},
{
"id" : "help_risk_assessing_vulnerability",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Reducing your vulnerability",
"heading" : "Second step: reducing your vulnerability to a threat",
Expand All @@ -87,7 +87,7 @@
},
{
"id" : "help_risk_mobile",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Safer mobile",
"heading" : "Safer mobile",
Expand All @@ -99,7 +99,7 @@
},
{
"id" : "help_using",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Using Panic Button",
"section_order" : "2",
Expand All @@ -121,7 +121,7 @@
},
{
"id" : "help_using_installation",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Installation",
"heading" : "Installation",
Expand All @@ -133,7 +133,7 @@
},
{
"id" : "help_using_configuration",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Configuration",
"heading" : "Configuration",
Expand All @@ -159,7 +159,7 @@
},
{
"id" : "help_using_configuration_contacts",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Setting Up Contacts",
"heading" : "Setting Up Contacts",
Expand All @@ -169,7 +169,7 @@
},
{
"id" : "help_using_configuration_alert_messages",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Create your alert message",
"heading" : "Create your alert message",
Expand All @@ -178,7 +178,7 @@
},
{
"id" : "help_using_configuration_code",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Create pin code",
"heading" : "Create pin code",
Expand All @@ -187,7 +187,7 @@
},
{
"id" : "help_using_configuration_alert",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Learn how to alert",
"heading" : "Learn how to alert",
Expand All @@ -196,7 +196,7 @@
},
{
"id" : "help_using_configuration_disguise",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Activate disguise",
"heading" : "Activate disguise",
Expand All @@ -205,7 +205,7 @@
},
{
"id" : "help_using_tips",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Preparing for Panic",
"heading" : "Tips for testing",
Expand All @@ -217,7 +217,7 @@
},
{
"id" : "help_using_faq",
"lang" : "en",
"lang" : "fr",
"type" : "simple",
"title" : "Frequently Ask Questions",
"heading" : "Frequently Ask Questions",
Expand Down
Loading

0 comments on commit 279aa67

Please sign in to comment.