Merge pull request #39 from quincunx/master

Regroup checkboxes and update punctuation.
jp-bennett · Sep 14, 2016 · 22f5b9b · 22f5b9b
2 parents 3eca3be + 6354aa6
commit 22f5b9b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/src/main/res/layout/activity_menu.xml b/app/src/main/res/layout/activity_menu.xml
@@ -17,18 +17,18 @@
         android:text="@string/config_nfc"
         />
     <CheckBox
-        android:id="@+id/chkb_dns"
+        android:id="@+id/chkb_notification"
         android:textSize="20sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/config_dns"
+        android:text="@string/config_notification"
         />
     <CheckBox
-        android:id="@+id/chkb_notification"
+        android:id="@+id/chkb_dns"
         android:textSize="20sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/config_notification"
+        android:text="@string/config_dns"
         />
     <TextView
         android:id="@+id/myip_url_txt"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -128,15 +128,15 @@
     <string name="config_Aports">Access Ports:</string>
     <string name="config_Ftimeout">Firewall Timeout:</string>
     <string name="config_Reknock">Keep open:</string>
-    <string name="config_notification">Show timeout notification:</string>
+    <string name="config_notification">Show timeout notification.</string>
     <string name="config_InternalIP">Internal IP:</string>
     <string name="config_internal_port">Internal Port:</string>
     <string name="config_cmd">Server Command:</string>
     <string name="config_ssh_app">Run External App:</string>
     <string name="config_ssh_uri">User@address:port</string>
     <string name="config_ovpn_uri">ovpn config name</string>
     <string name="config_http_url">Http or https address to query to find our IP:</string>
-    <string name="config_dns">Try to retrieve our ip using dns first.</string>
+    <string name="config_dns">Try to retrieve our IP using dns first.</string>
     <string name="config_button_save">Save settings</string>
     <string name="configure">Configure</string>
     <string name="config_button_default">Default</string>