More harcoded translations + Spanish

3 files changed, 13 insertions, 13 deletions

diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index 73f21ad0..f866a485 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="8dp"
-        android:text="Conference" />
+        android:text="@string/muc_details_conference" />
        <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
             android:layout_toLeftOf="@+id/muc_edit_subject"
             android:background="#eee"
             android:ems="10"
-            android:hint="Conferenece Subject"
+            android:hint="@string/muc_details_conference_subject"
             android:inputType="textAutoComplete"
             android:paddingBottom="12dp"
             android:paddingLeft="8dp"
@@ -62,7 +62,7 @@
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="8dp"
-        android:text="Your Nickname" />
+        android:text="@string/muc_details_your_nickname" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -78,7 +78,7 @@
             android:layout_toLeftOf="@+id/muc_edit_nick"
             android:background="#eee"
             android:ems="10"
-            android:hint="Your nickname"
+            android:hint="@string/muc_details_your_nickname"
             android:inputType="textEmailAddress"
             android:paddingBottom="12dp"
             android:paddingLeft="8dp"
@@ -119,7 +119,7 @@
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="8dp"
-        android:text="Other Members" />
+        android:text="@string/muc_details_other_members" />
 
     <LinearLayout
         android:id="@+id/muc_members"
diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml
index a2b00af1..78500ead 100644
--- a/res/layout/activity_new_conversation.xml
+++ b/res/layout/activity_new_conversation.xml
@@ -23,7 +23,7 @@
         android:layout_alignParentTop="true"
         android:background="#eee"
         android:ems="10"
-        android:hint="Search or enter Jabber ID"
+        android:hint="@string/search_jabber_id"
         android:inputType="textEmailAddress"
         android:paddingBottom="12dp"
         android:paddingLeft="8dp"
diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml
index a5733cfe..12fbe468 100644
--- a/res/layout/edit_account_dialog.xml
+++ b/res/layout/edit_account_dialog.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        android:text="Jabber ID:" />
+        android:text="@string/account_settings_jabber_id" />
 
 
     
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType="textEmailAddress"
-        android:hint="username@example.com">
+        android:hint="@string/account_settings_example_jabber_id">
 
 
     </EditText>
@@ -30,7 +30,7 @@
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Password:"
+        android:text="@string/account_settings_password"
         android:textSize="14sp"/>
 
     <EditText
@@ -39,14 +39,14 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType="textPassword"
-        android:hint="Password" 
+        android:hint="@string/password"
         android:fontFamily="sans-serif" />
 
     <CheckBox
         android:id="@+id/edit_account_register_new"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Register a new account on server"/>
+        android:text="@string/register_account"/>
 
     
         <TextView
@@ -54,7 +54,7 @@
         android:id="@+id/account_confirm_password_desc"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Confirm password:"
+        android:text="@string/account_settings_confirm_password"
         android:textSize="14sp"
         android:visibility="gone"/>
     
@@ -64,7 +64,7 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:inputType="textPassword"
-        android:hint="Confirm password" 
+        android:hint="@string/confirm_password"
         android:visibility="gone"
         android:fontFamily="sans-serif" />