make some strings translateable

closes signalapp#2567 //FREEBIE
qiqo · Mar 4, 2015 · 067b14d · 067b14d
1 parent 03110c9
commit 067b14d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 14 deletions.
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
@@ -43,7 +43,7 @@
                             android:layout_width="0dp"
                             android:layout_height="150dip"
                             android:layout_weight="1"
-                            android:contentDescription="Attachment Thumbnail"/>
+                            android:contentDescription="@string/conversation_activity__attachment_thumbnail"/>
 
                     <LinearLayout
                             android:orientation="vertical"

diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
@@ -27,7 +27,7 @@
             android:scaleType="centerCrop"
             android:visibility="gone"
             tools:src="@drawable/ic_contact_picture"
-            android:contentDescription="Contact Photo Image"
+            android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
             android:layout_marginLeft="0dp" />
     </FrameLayout>
 
@@ -65,15 +65,15 @@
                        android:layout_width="20sp"
                        android:visibility="gone"
                        android:src="@drawable/ic_attachment_universal_small"
-                       android:contentDescription="Attachment Indicator" />
+                       android:contentDescription="@string/conversation_list_item_view__attachment_indicator" />
 
             <ImageView android:id="@+id/error"
                        android:layout_marginLeft="3dip"
                        android:layout_height="match_parent"
                        android:layout_width="20sp"
                        android:visibility="gone"
                        android:src="@drawable/ic_action_warning_red"
-                       android:contentDescription="Error Alert" />
+                       android:contentDescription="@string/conversation_list_item_view__error_alert" />
 
             <TextView android:id="@+id/date"
                       android:layout_marginLeft="3dip"

diff --git a/res/layout/registration_progress_activity.xml b/res/layout/registration_progress_activity.xml
@@ -35,7 +35,7 @@
                         android:paddingLeft="4dip"
                         android:paddingRight="4dip"
                         android:src="@drawable/alert"
-                        android:contentDescription="Alert"/>
+                        android:contentDescription="@string/registration_progress_activity__alert"/>
 
                 <TextView
                         style="@style/Registration.Constant"
@@ -73,7 +73,7 @@
                            android:paddingLeft="4dip"
                            android:paddingRight="4dip"
                            android:src="@drawable/telephone"
-                           android:contentDescription="Telephone"/>
+                           android:contentDescription="@string/registration_progress_activity__telephone"/>
 
                 <TextView style="@style/Registration.Constant"
                           android:layout_width="wrap_content"
@@ -167,7 +167,7 @@
                         android:paddingLeft="4dip"
                         android:paddingRight="4dip"
                         android:src="@drawable/alert"
-                        android:contentDescription="Alert"/>
+                        android:contentDescription="@string/registration_progress_activity__alert"/>
 
                 <TextView
                         style="@style/Registration.Constant"
@@ -318,7 +318,7 @@
                                 android:paddingRight="4dip"
                                 android:src="@drawable/check_dark"
                                 android:visibility="invisible"
-                                android:contentDescription="Check"/>
+                                android:contentDescription="@string/registration_progress_activity__check"/>
 
                         <ProgressBar
                                 android:id="@+id/connecting_progress"
@@ -362,7 +362,7 @@
                                 android:paddingRight="4dip"
                                 android:src="@drawable/check_dark"
                                 android:visibility="invisible"
-                                android:contentDescription="Check"/>
+                                android:contentDescription="@string/registration_progress_activity__check"/>
 
                         <ProgressBar
                                 android:id="@+id/verification_progress"
@@ -406,7 +406,7 @@
                                 android:paddingRight="4dip"
                                 android:src="@drawable/check_dark"
                                 android:visibility="invisible"
-                                android:contentDescription="Check"/>
+                                android:contentDescription="@string/registration_progress_activity__check"/>
 
                         <ProgressBar
                                 android:id="@+id/generating_keys_progress"
@@ -450,7 +450,7 @@
                                 android:paddingRight="4dip"
                                 android:src="@drawable/check_dark"
                                 android:visibility="invisible"
-                                android:contentDescription="Check"/>
+                                android:contentDescription="@string/registration_progress_activity__check"/>
 
                         <ProgressBar
                                 android:id="@+id/gcm_registering_progress"

diff --git a/res/layout/transport_selection_list_item.xml b/res/layout/transport_selection_list_item.xml
@@ -10,7 +10,7 @@
     <ImageView android:id="@+id/icon"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:contentDescription="Transport icon"/>
+               android:contentDescription="@string/transport_selection_list_item__transport_icon"/>
     <TextView android:id="@+id/text"
               android:paddingLeft="10dp"
               android:fontFamily="sans-serif-light"

diff --git a/res/menu/conversation_insecure.xml b/res/menu/conversation_insecure.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:title="Invite"
+    <item android:title="@string/conversation_insecure__invite"
           android:id="@+id/menu_invite"/>
 
 </menu>
diff --git a/res/menu/conversation_insecure_no_push.xml b/res/menu/conversation_insecure_no_push.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:title="Security"
+    <item android:title="@string/conversation_insecure__security"
           android:id="@+id/menu_security"
           android:icon="?menu_unlock_icon"
           app:showAsAction="ifRoom">

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -483,6 +483,7 @@
     <string name="conversation_activity__window_description">Conversation with %1$s</string>
     <string name="conversation_activity__compose_description">Message composition</string>
     <string name="conversation_activity__emoji_toggle_description">Toggle emoji keyboard</string>
+    <string name="conversation_activity__attachment_thumbnail">Attachment Thumbnail</string>
 
     <!-- conversation_item -->
     <string name="conversation_item__mms_image_description">Media message</string>
@@ -652,6 +653,9 @@
         failed.
     </string>
     <string name="registration_progress_activity__generating_keys">Generating keys...</string>
+    <string name="registration_progress_activity__alert">Alert</string>
+    <string name="registration_progress_activity__telephone">Telephone</string>
+    <string name="registration_progress_activity__check">Check</string>
 
     <!-- recipients_panel -->
     <string name="recipients_panel__to"><small>Enter a name or number</small></string>
@@ -843,8 +847,12 @@
     <!-- conversation_context_image -->
     <string name="conversation_context_image__save_attachment">Save attachment</string>
 
+    <!-- conversation_insecure -->
+    <string name="conversation_insecure__invite">Invite</string>
+
     <!-- conversation_insecure_no_push -->
     <string name="conversation_insecure__menu_start_secure_session">Start secure session</string>
+    <string name="conversation_insecure__security">Security</string>
 
     <!-- conversation_list_batch -->
     <string name="conversation_list_batch__menu_delete_selected">Delete selected</string>
@@ -853,6 +861,11 @@
     <!-- conversation_list -->
     <string name="conversation_list__menu_search">Search</string>
 
+    <!-- conversation_list_item_view -->
+    <string name="conversation_list_item_view__contact_photo_image">Contact Photo Image</string>
+    <string name="conversation_list_item_view__attachment_indicator">Attachment Indicator</string>
+    <string name="conversation_list_item_view__error_alert">Error alert</string>
+
     <!-- conversation_list_fragment -->
     <string name="conversation_list_fragment__fab_content_description">New conversation</string>
 
@@ -915,6 +928,9 @@
     <string name="trimmer__deleting_old_messages">Deleting old messages...</string>
     <string name="trimmer__old_messages_successfully_deleted">Old messages successfully deleted</string>
 
+    <!-- transport_selection_list_item -->
+    <string name="transport_selection_list_item__transport_icon">Transport icon</string>
+
     <!-- EOF -->
 
 </resources>