changed labels and strings

37coins · May 5, 2014 · a5f93c0 · a5f93c0
1 parent d74b127
commit a5f93c0
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 37 deletions.
diff --git a/mobile/btc2sms/res/values/strings.xml b/mobile/btc2sms/res/values/strings.xml
@@ -2,20 +2,20 @@
 <resources>
     <string name="hello_world">Hello_World</string>
     <string name="action_settings">Hello_World</string>
-    <string name="app_name">EnvayaSMS</string>
-    <string name="running">EnvayaSMS running</string>
-    <string name="disabled">EnvayaSMS disabled</string>
-    <string name="started">EnvayaSMS started.</string>
-    <string name="stopped">EnvayaSMS stopped.</string>
-    <string name="log_view_title">EnvayaSMS : Log View</string>
-    <string name="add_phone_title">EnvayaSMS : Add Phone</string>    
-    <string name="expansion_packs_title">EnvayaSMS : SMS Rate Limit</string>    
-    <string name="help_title">EnvayaSMS : Help</string>    
-    <string name='test_phone_numbers_title'>EnvayaSMS : Test Phone Numbers</string>
-    <string name='ignored_phone_numbers_title'>EnvayaSMS : Ignored Phone Numbers</string>
-    <string name='forward_saved_title'>EnvayaSMS : Forward Saved Messages</string>
-    <string name='pending_messages_title'>EnvayaSMS : Pending Messages</string>
-    <string name='settings_title'>EnvayaSMS : Settings</string>
+    <string name="app_name">SMSgateway</string>
+    <string name="running">SMSgateway running</string>
+    <string name="disabled">SMSgateway disabled</string>
+    <string name="started">SMSgateway started.</string>
+    <string name="stopped">SMSgateway stopped.</string>
+    <string name="log_view_title">SMSgateway : Log View</string>
+    <string name="add_phone_title">SMSgateway : Add Phone</string>    
+    <string name="expansion_packs_title">SMSgateway : SMS Rate Limit</string>    
+    <string name="help_title">SMSgateway : Help</string>    
+    <string name='test_phone_numbers_title'>SMSgateway : Test Phone Numbers</string>
+    <string name='ignored_phone_numbers_title'>SMSgateway : Ignored Phone Numbers</string>
+    <string name='forward_saved_title'>SMSgateway : Forward Saved Messages</string>
+    <string name='pending_messages_title'>SMSgateway : Pending Messages</string>
+    <string name='settings_title'>SMSgateway : Settings</string>
     <string name="settings">Settings</string>
     <string name="test">Test Connection</string>
     <string name="check_now">Check Messages</string>
@@ -24,11 +24,13 @@
     <string name="retry_now">Retry</string>
     <string name="forward_saved">Fwd Saved...</string>
     <string name='service_started'>New messages will be forwarded to server</string>
-    <string name='test_phone_numbers'>When running EnvayaSMS in Test Mode, 
-EnvayaSMS will only forward SMS messages from the phone numbers 
+    <string name='test_phone_numbers'>When running SMSgateway in Test Mode, 
+SMSgateway will only forward SMS messages from the phone numbers 
 listed below. (Incoming SMS messages from other phone numbers will be saved 
 in the normal Messaging inbox.)</string>
     <string name='ignored_phone_numbers'>
-EnvayaSMS will ignore SMS messages from the phone numbers listed below. 
+SMSgateway will ignore SMS messages from the phone numbers listed below. 
 Incoming messages from these senders will be saved in the normal Messaging inbox.</string>
+    <string name='splash_loading'>Loading...</string>
+
 </resources>
diff --git a/mobile/btc2sms/res/xml/prefs.xml b/mobile/btc2sms/res/xml/prefs.xml
@@ -4,7 +4,7 @@
 
     <CheckBoxPreference
             android:key="enabled" 
-            android:title="Enable EnvayaSMS" 
+            android:title="Enable SMSgateway" 
             android:defaultValue='false'
             android:summaryOn="New messages will be forwarded between phone and server"
             android:summaryOff="New messages will not be forwarded between phone and server"
@@ -54,8 +54,8 @@
     <CheckBoxPreference
             android:key="call_notifications"
             android:title="Call notifications"
-            android:summaryOff="EnvayaSMS will not notify server when phone receives an incoming call"
-            android:summaryOn="EnvayaSMS will notify server when phone receives an incoming call"
+            android:summaryOff="SMSgateway will not notify server when phone receives an incoming call"
+            android:summaryOn="SMSgateway will notify server when phone receives an incoming call"
     ></CheckBoxPreference>    
 
     <PreferenceScreen 
@@ -65,8 +65,8 @@
     >
         <intent 
             android:action="android.intent.action.MAIN"
-            android:targetPackage="org.envaya.sms"
-            android:targetClass="org.envaya.sms.ui.ExpansionPacks" /> 
+            android:targetPackage="org.btc4all.btc2sms"
+            android:targetClass="org.btc4all.btc2sms.ui.ExpansionPacks" />
     </PreferenceScreen>               
 
     <CheckBoxPreference
@@ -79,31 +79,31 @@
     <PreferenceScreen 
         android:key="ignored_numbers" 
         android:title="Ignored phones"
-        android:summary="Configure the phone numbers that EnvayaSMS will ignore"
+        android:summary="Configure the phone numbers that SMSgateway will ignore"
     >        
        <intent 
             android:action="android.intent.action.MAIN"
-            android:targetPackage="org.envaya.sms"
-            android:targetClass="org.envaya.sms.ui.IgnoredPhoneNumbers" />
+            android:targetPackage="org.btc4all.btc2sms"
+            android:targetClass="org.btc4all.btc2sms.ui.IgnoredPhoneNumbers" />
     </PreferenceScreen>
 
     <CheckBoxPreference
             android:key="test_mode"
             android:title="Test mode"
-            android:summaryOff="Test mode is off (EnvayaSMS forwards all SMS)"
-            android:summaryOn="Test mode is on (EnvayaSMS only forwards SMS to/from specific phones)"
+            android:summaryOff="Test mode is off (SMSgateway forwards all SMS)"
+            android:summaryOn="Test mode is on (SMSgateway only forwards SMS to/from specific phones)"
     ></CheckBoxPreference>
 
     <PreferenceScreen 
         android:key="test_numbers" 
         android:title="Sender phones"
         android:dependency="test_mode"
-        android:summary="Configure the phone numbers that EnvayaSMS will handle"
+        android:summary="Configure the phone numbers that SMSgateway will handle"
     >
        <intent 
             android:action="android.intent.action.MAIN"
-            android:targetPackage="org.envaya.sms"
-            android:targetClass="org.envaya.sms.ui.TestPhoneNumbers" />
+            android:targetPackage="org.btc4all.btc2sms"
+            android:targetClass="org.btc4all.btc2sms.ui.TestPhoneNumbers" />
     </PreferenceScreen>        
 
     </PreferenceCategory>   
@@ -205,12 +205,12 @@
     <PreferenceCategory android:title="Help">
     <PreferenceScreen 
             android:key="help" 
-            android:title="About EnvayaSMS"
+            android:title="About SMSgateway"
         >
        <intent 
             android:action="android.intent.action.MAIN"
-            android:targetPackage="org.envaya.sms"
-            android:targetClass="org.envaya.sms.ui.Help" />
+            android:targetPackage="org.btc4all.btc2sms"
+            android:targetClass="org.btc4all.btc2sms.ui.Help" />
     </PreferenceScreen>
     </PreferenceCategory>
 

diff --git a/mobile/btc2sms/src/main/java/org/btc4all/btc2sms/ui/MessagingForwarder.java b/mobile/btc2sms/src/main/java/org/btc4all/btc2sms/ui/MessagingForwarder.java
@@ -39,9 +39,9 @@ public void onCreate(Bundle icicle) {
         setContentView(R.layout.inbox);
 
         final String[] inboxTypeClasses = new String[] {
-                "org.envaya.sms.ui.MessagingSmsInbox", 
-                "org.envaya.sms.ui.MessagingMmsInbox",
-                "org.envaya.sms.ui.MessagingSentSms",
+                "org.btc4all.btc2sms.ui.MessagingSmsInbox",
+                "org.btc4all.btc2sms.ui.MessagingMmsInbox",
+                "org.btc4all.btc2sms.ui.MessagingSentSms",
         };
 
         final String[] inboxTypeNames = new String[] {
@@ -50,7 +50,7 @@ public void onCreate(Bundle icicle) {
                 "Sent SMS"
         };
 
-        Spinner spinner = (Spinner) findViewById(R.id.inbox_selector);        
+        Spinner spinner = (Spinner) findViewById(R.id.inbox_selector);
 
         ArrayAdapter<String> inboxTypeAdapter = new ArrayAdapter<String>(this,
             android.R.layout.simple_spinner_item, inboxTypeNames);