diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java index a2fcdd2..d899de9 100644 --- a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java @@ -235,11 +235,11 @@ public class LogManagerControlActivity extends AppCompatActivity { tv = (TextView) findViewById(R.id.authStatusTv); btn = (Button) findViewById(R.id.auth_button); if (mLm.mWac.isLoggedIn()) { - tv.setText("Authenticated"); - btn.setText("Log Out"); + tv.setText(getString(R.string.logged_in_with_token)); + btn.setText(getString(R.string.logout)); } else { - tv.setText("NOT AUTHENTICATED"); - btn.setText("Log In"); + tv.setText(getString(R.string.not_authenticated)); + btn.setText(getString(R.string.login)); } } else { stopUpdating = false; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f91fe49..6de56c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,8 +71,8 @@ Mute Alarms Audible Alarms OFF FAULT - Authenticate - Not Authenticated + Log In + Not Logged In Cancel Email @@ -161,18 +161,18 @@ Pebble Datasource Select Data Source Select the seizure detector data source to use. - Log Alarm events to SD Card - Log Alarm events to SD Card - Log Data to SD Card Regularly - Log Data to SD Card - Log Data to Central OpenSeizureDetector Database - Log Data Remotely - Use mobile internet to log remote data + Log Alarm events to Phone Storage + Log Alarm Events + Log Data to Phone Storage + Log Data + Share Data with OpenSeizureDetector + Share Data + Use mobile internet to share data Use Mobile Internet - Username for remote data logging. - Remote Username - Password for remote data logging. - Remote Password + Username + Username for data sharing + Password for data sharing + Password Wearer ID Wearer ID of the person wearing the watch (from OSD Web API) URL for remote data logging. @@ -291,9 +291,9 @@ Treat Null Value as Alarm Oxygen Saturation Low Alarm Level (%) O2 Saturation Low Alarm Level (%) - AuthenticateActivity + Log in to OpenSeizureDetector Data Sharing Log Out - Logged in with Token: + Logged in with Token Local Database Remote Database Number of Stored Events: @@ -329,7 +329,8 @@ Unvalidated Seizure Events Register New User Reset Password - Log in to osdApi Remote Database + Log in to Share Data + Log In Data Sharing Status Not Logging Data Not Sharing Logged Data