From b7603f7793d50a98818310a96616c9bae5030ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Mon, 11 Feb 2013 13:43:18 +0200
Subject: [PATCH] Quick sanitization on messages

---
 commons/res/values-qq/strings.xml | 10 ++--------
 commons/res/values/error.xml      |  4 ++--
 commons/res/values/strings.xml    | 16 ++++++++--------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/commons/res/values-qq/strings.xml b/commons/res/values-qq/strings.xml
index 15ce10db8..1cca5d0f6 100644
--- a/commons/res/values-qq/strings.xml
+++ b/commons/res/values-qq/strings.xml
@@ -2,19 +2,13 @@
 
     <string name="app_name">The name of the application</string>
     <string name="menu_settings">Label for menu item to show settings</string>
-    <string name="title_activity_login">Sign in to Wikimedia Commons</string>
-    <string name="login_subtitle">Login to upload media to commons</string>
-    <string name="username">Username</string>
-    <string name="password">Password</string>
     <string name="login">Button to have people log in</string>
     <string name="logging_in_title">Title of dialog box shown while logging in</string>
     <string name="logging_in_message">Contents of dialog box shown while logging in</string>
-    <string name="title_activity_share">Wikimedia Commons</string>
-    <string name="upload_overlay_title">Upload to Commons</string>
     <string name="login_success">Message when login has succeeded</string>
     <string name="login_failed">Message when login has failed</string>
     <string name="uploading_started">Toast message when uploading has started</string>
-   
+
     <string name="upload_completed_notification_title">Title for notification about upload being completed. %1$s represents file name.</string>
     <string name="upload_completed_notification_text">Text for notification about upload being completed.</string>
     <string name="upload_progress_notification_title_start">Title for notificiation about upload being started. %1$s represents file name</string>
@@ -33,4 +27,4 @@
     <string name="menu_from_camera">Action bar item to prompt the user to pick a picture from the phone to upload</string>
 
     <string name="provider_contributions">Display name for user\'s contributions in the phone\'s settings sync screen</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/commons/res/values/error.xml b/commons/res/values/error.xml
index 4fcd181df..352524f4b 100644
--- a/commons/res/values/error.xml
+++ b/commons/res/values/error.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="crash_dialog_title">Commons has crashed</string>
-    <string name="crash_dialog_text">Shortage of Chicken 65 and hats has caused the app to crash!</string>
+    <string name="crash_dialog_text">Oops. Something went wrong!</string>
     <string name="crash_dialog_comment_prompt">Tell us what you were doing, then share it via email to us. Will help us fix it!</string>
     <string name="crash_dialog_ok_toast">Thank you!</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/commons/res/values/strings.xml b/commons/res/values/strings.xml
index 37d2ed54a..77d45dc74 100644
--- a/commons/res/values/strings.xml
+++ b/commons/res/values/strings.xml
@@ -4,12 +4,12 @@
     <string name="hello_world">Hello world!</string>
     <string name="menu_settings">Settings</string>
     <string name="title_activity_login">Sign in to Wikimedia Commons</string>
-    <string name="login_subtitle">Login to upload media to commons</string>
+    <string name="login_subtitle">Login to upload media to Wikimedia Commons</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
-    <string name="login">Log In</string>
-    <string name="logging_in_title">Logging In</string>
-    <string name="logging_in_message">Witty text here</string>
+    <string name="login">Log in</string>
+    <string name="logging_in_title">Logging in</string>
+    <string name="logging_in_message">Please wait...</string>
     <string name="title_activity_share">Wikimedia Commons</string>
     <string name="upload_overlay_title">Upload to Commons</string>
     <string name="login_success">Login success!</string>
@@ -26,13 +26,13 @@
     <string name="upload_failed_notification_subtitle">Tap to retry</string>
     <string name="uploads_pending_notification_indicator">%d left</string>
 
-    <string name="title_activity_contributions">My Contributions</string>
+    <string name="title_activity_contributions">My contributions</string>
     <string name="contribution_state_queued">Queued</string>
     <string name="contribution_state_failed">Failed</string>
     <string name="contribution_state_in_progress">%1$d%% complete</string>
     <string name="contribution_state_starting">Uploading</string>
     <string name="menu_from_gallery">From Gallery</string>
-    <string name="menu_from_camera">Take Photo</string>
+    <string name="menu_from_camera">Take photo</string>
 
-    <string name="provider_contributions">My Contributions</string>
-</resources>
\ No newline at end of file
+    <string name="provider_contributions">My contributions</string>
+</resources>