Guy to rename string resource name.

s-aska · Jan 22, 2014 · 80ac26d · 80ac26d
1 parent c8dcbb2
commit 80ac26d
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 123 deletions.
diff --git a/res/layout/activity_edit_profile.xml b/res/layout/activity_edit_profile.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:text="@string/update_profile_image" />
+                android:text="@string/label_update_profile_image" />
         </LinearLayout>
 
         <LinearLayout
@@ -38,7 +38,7 @@
                 android:layout_width="64dip"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@string/name" />
+                android:text="@string/label_name" />
 
             <EditText
                 android:id="@+id/name"
@@ -57,7 +57,7 @@
                 android:layout_width="64dip"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@string/location" />
+                android:text="@string/label_location" />
 
             <EditText
                 android:id="@+id/location"
@@ -76,7 +76,7 @@
                 android:layout_width="64dip"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@string/web_site" />
+                android:text="@string/label_web_site" />
 
             <EditText
                 android:id="@+id/web_site"
@@ -95,7 +95,7 @@
                 android:layout_width="64dip"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@string/bio" />
+                android:text="@string/label_bio" />
 
             <EditText
                 android:id="@+id/bio"
@@ -109,6 +109,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
-            android:text="@string/save" />
+            android:text="@string/button_save" />
     </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/activity_post.xml b/res/layout/activity_post.xml
@@ -64,7 +64,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dip"
-                    android:text="@string/tweet_count" />
+                    android:text="@string/label_tweet_count" />
 
                 <Button
                     android:id="@+id/tweet"

diff --git a/res/layout/activity_profile.xml b/res/layout/activity_profile.xml
@@ -70,7 +70,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/tweets" />
+                    android:text="@string/label_tweets" />
             </LinearLayout>
 
             <LinearLayout
@@ -92,7 +92,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/following" />
+                    android:text="@string/label_following" />
             </LinearLayout>
 
             <LinearLayout
@@ -114,7 +114,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/followers" />
+                    android:text="@string/label_followers" />
             </LinearLayout>
 
             <LinearLayout
@@ -136,7 +136,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/listed" />
+                    android:text="@string/label_listed" />
             </LinearLayout>
 
             <LinearLayout
@@ -158,7 +158,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:text="@string/favourites" />
+                    android:text="@string/label_favourites" />
             </LinearLayout>
 
             <LinearLayout

diff --git a/res/layout/activity_user_list.xml b/res/layout/activity_user_list.xml
@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/users" />
+                android:text="@string/tab_users" />
         </LinearLayout>
 
         <LinearLayout
@@ -40,7 +40,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/tweets" />
+                android:text="@string/label_tweets" />
         </LinearLayout>
     </LinearLayout>
 

diff --git a/res/menu/main.xml b/res/menu/main.xml
@@ -4,22 +4,22 @@
         android:id="@+id/user_list"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/user_list" />
+        android:title="@string/menu_user_list" />
     <item
         android:id="@+id/profile"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/profile" />
+        android:title="@string/menu_profile" />
     <item
         android:id="@+id/search"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/search" />
+        android:title="@string/menu_search" />
     <item
         android:id="@+id/sign_out"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/sign_out" />
+        android:title="@string/menu_sign_out" />
     <item
         android:id="@+id/official_website"
         android:orderInCategory="100"

diff --git a/res/menu/post.xml b/res/menu/post.xml
@@ -4,11 +4,11 @@
         android:id="@+id/tweet_clear"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/tweet_clear" />
+        android:title="@string/menu_clear" />
 
     <item
         android:id="@+id/tweet_battery"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/tweet_battery" />
+        android:title="@string/menu_battery_level" />
 </menu>
diff --git a/res/menu/profile.xml b/res/menu/profile.xml
@@ -4,26 +4,26 @@
         android:id="@+id/send_reply"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/send_reply" />
+        android:title="@string/menu_send_reply" />
     <item
         android:id="@+id/send_direct_messages"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/send_direct_messages" />
+        android:title="@string/menu_send_direct_messages" />
     <item
         android:id="@+id/open_twitter"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/open_twitter" />
+        android:title="@string/menu_open_twitter" />
     <item
         android:id="@+id/open_favstar"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/open_favstar" />
+        android:title="@string/menu_open_favstar" />
     <item
         android:id="@+id/open_twilog"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/open_twilog" />
+        android:title="@string/menu_open_twilog" />
 
 </menu>
diff --git a/res/menu/scale_image.xml b/res/menu/scale_image.xml
@@ -5,6 +5,6 @@
         android:id="@+id/save"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/save" />
+        android:title="@string/button_save" />
 
 </menu>
diff --git a/res/menu/search.xml b/res/menu/search.xml
@@ -4,5 +4,5 @@
         android:id="@+id/save_search"
         android:orderInCategory="100"
         android:showAsAction="never"
-        android:title="@string/save_search" />
+        android:title="@string/menu_save_search" />
 </menu>