From 236895e7f88813546c99a5d3306285e033998faf Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 29 Nov 2012 12:26:55 +0100
Subject: [PATCH] Refactored app name in strings.xml

---
 res/layout-land/account_setup.xml                  |  5 +-
 res/layout/account_setup.xml                       |  5 +-
 res/values/strings.xml                             | 95 +++++++++++-----------
 res/values/urls.xml                                |  4 +
 src/com/owncloud/android/Uploader.java             |  5 +-
 .../android/location/LocationUpdateService.java    |  5 +-
 .../android/ui/activity/AuthenticatorActivity.java |  8 +-
 .../android/ui/activity/FileDisplayActivity.java   |  5 +-
 8 files changed, 73 insertions(+), 59 deletions(-)
 create mode 100644 res/values/urls.xml

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index 1e4417af..24b3e8ad 100644
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -170,6 +170,7 @@
                 android:onClick="onOkClick"
                 android:text="@string/setup_btn_connect"
                 android:textColor="@android:color/black" />
+            
         </LinearLayout>
         
 		<Button
@@ -182,8 +183,8 @@
 			android:paddingTop="10dp"
 			android:paddingBottom="10dp"
 			android:textColor="#0000FF"
-			android:background="@android:color/transparent"
-			android:text="@string/auth_register" />
+			android:background="@android:color/transparent" />
+			<!-- android:text="@string/app_name @string/auth_register" /-->
         
     </RelativeLayout>
 
diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index 59eba132..c5c4d9f5 100644
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -181,9 +181,8 @@
 			android:paddingTop="10dp"
 			android:paddingBottom="10dp"
 			android:textColor="#0000FF"
-			android:background="@android:color/transparent"
-			android:text="@string/auth_register" />
-            
+			android:background="@android:color/transparent" />
+			<!-- android:text="@string/app_name @string/auth_register" /-->
         
     </RelativeLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 410b4eed..77b7a324 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello">Hello World, OwnCloudMainScreen!</string>
     <string name="app_name">ownCloud</string>
     <string name="main_password">Password:</string>
     <string name="main_login">Username:</string>
     <string name="main_button_login">Login</string>
-    <string name="main_welcome">Welcome to your ownCloud</string>
+    <string name="main_welcome">Welcome</string>
     <string name="main_files">Files</string>
     <string name="main_music">Music</string>
     <string name="main_contacts">Contacts</string>
@@ -13,9 +12,9 @@
     <string name="main_bookmarks">Bookmarks</string>
     <string name="main_settings">Settings</string>
     <string name="main_tit_accsetup">Setup Account</string>
-    <string name="main_wrn_accsetup">There are no ownCloud accounts on your device. In order to use this App, you need to create one.</string>
+    <string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string>
     
-	<string name="about_message">ownCloud Android client\n\nversion: %1$s</string>
+    <string name="about_message">%1$s Android App\n\nversion: %2$s</string>
     
     <string name="actionbar_sync">Refresh</string>
     <string name="actionbar_upload">Upload</string>
@@ -30,41 +29,41 @@
     <string name="prefs_add_session">Add new session</string>
     <string name="prefs_create_img_thumbnails">Create image thumbnails</string>
     <string name="prefs_select_oc_account">Select an account</string>
-    <string name="prefs_summary_select_oc_account">Choose, which of your accounts the app should use.</string>
-    <string name="prefs_trackmydevice">Device tracking</string>
-    <string name="prefs_trackmydevice_summary_off">Enable ownCloud to track your device location</string>
-    <string name="prefs_trackmydevice_summary_on">Your ownCloud keeps track of this device</string>
-    <string name="prefs_trackmydevice_interval">Update interval</string>
+    <string name="prefs_summary_select_oc_account">Choose which of your accounts the app should use.</string>
+    <string name="prefs_trackmydevice">Device Tracking</string>
+    <string name="prefs_trackmydevice_summary_off">Enable this App to track your device location</string>
+    <string name="prefs_trackmydevice_summary_on">This App keeps track of this device</string>
+    <string name="prefs_trackmydevice_interval">Update Interval</string>
     <string name="prefs_trackmydevice_interval_summary">Update every %1$s minutes</string>
     <string name="prefs_accounts">Accounts</string>
-    <string name="prefs_manage_accounts">Manage accounts</string>
-    <string name="prefs_pincode">ownCloud App PIN</string>
-    <string name="prefs_pincode_summary">Protect your ownCloud client</string>
-    <string name="prefs_instant_upload">Enable instant uploading</string>
+    <string name="prefs_manage_accounts">Manage Accounts</string>
+    <string name="prefs_pincode">App PIN</string>
+    <string name="prefs_pincode_summary">Protect your client</string>
+    <string name="prefs_instant_upload">Enable instant uploads</string>
     <string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</string>
     
-    <string name="auth_host_url">ownCloud URL</string>
+    <string name="auth_host_url">URL</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
-    <string name="auth_register">I am new to ownCloud</string>
-    <string name="new_session_uri_error">Wrong URL given</string>
-    <string name="new_session_session_name_error">Wrong session name</string>
+    <string name="auth_register">I am new to %1$s</string>
+    <string name="new_session_uri_error">Incorrect address given</string>
+    <string name="new_session_session_name_error">Incorrect session name</string>
     <string name="sync_string_files">Files</string>
     <string name="uploader_no_file_selected">No file selected for upload</string>
     <string name="setup_hint_username">Username</string>
     <string name="setup_hint_password">Password</string>
     <string name="setup_hint_address">Web address</string>
     <string name="setup_hint_show_password">Show password?</string>
-    <string name="setup_title">Connect to your ownCloud</string>
+    <string name="setup_title">Connect to your %1$s</string>
     <string name="setup_btn_connect">Connect</string>
     <string name="uploader_btn_upload_text">Upload</string>
     <string name="uploader_wrn_no_account_title">No account found</string>
-    <string name="uploader_wrn_no_account_text">There are no ownCloud accounts on your device. Please setup an account first.</string>
+    <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please setup an account first.</string>
     <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
     <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
 	<string name="uploader_wrn_no_content_title">No content to upload</string>
 	<string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
-    <string name="uploader_error_forbidden_content">ownCloud is not allowed to access the shared content</string>
+    <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="uploader_btn_create_dir_text">Create directory for upload</string>
 	<string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</string>
@@ -85,7 +84,7 @@
     <string name="common_cancel_upload">Cancel upload</string>
 	<string name="common_cancel">Cancel</string>
     <string name="common_save_exit">Save &amp; Exit</string>
-    <string name="common_exit">Leave ownCloud</string>
+    <string name="common_exit">Leave %1$s</string>
     <string name="common_error">Error</string>
     <string name="about_title">About</string>
     
@@ -97,15 +96,15 @@
 	<string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>    
 	<string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>    
 	<string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
-    <string name="uploader_upload_succeeded_content_single">%1$s was successfully upload</string>
-    <string name="uploader_upload_succeeded_content_multiple">%1$d files were successfully upload</string>
+    <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
+    <string name="uploader_upload_succeeded_content_multiple">%1$d files were successfully uploaded</string>
     <string name="uploader_upload_failed_ticker">Upload failed</string>
     <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
     <string name="uploader_upload_failed_content_multiple">Upload failed: %1$d/%2$d files were upload</string>
     <string name="downloader_download_in_progress_ticker">Downloading &#8230;</string>
     <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
     <string name="downloader_download_succeeded_ticker">Download succeeded</string>
-    <string name="downloader_download_succeeded_content">%1$s was successfully download</string>
+    <string name="downloader_download_succeeded_content">%1$s was successfully downloaded</string>
     <string name="downloader_download_failed_ticker">Download failed</string>
     <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
     <string name="common_choose_account">Choose account</string>
@@ -117,18 +116,18 @@
     <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
 	<string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
 	<string name="use_ssl">Use Secure Connection</string>
-    <string name="location_no_provider">ownCloud cannot track your device. Please check your location settings</string>
+    <string name="location_no_provider">%1$s cannot track your device. Please check your location settings</string>
     
     <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
     <string name="pincode_enter_new_pin_code">Please, insert your new App PIN</string>
-    <string name="pincode_configure_your_pin">Enter ownCloud App PIN</string>
+    <string name="pincode_configure_your_pin">Enter your App PIN</string>
     <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string> 
-    <string name="pincode_reenter_your_pincode">Reenter ownCloud App PIN, please</string>
-    <string name="pincode_remove_your_pincode">Remove your ownCloud App PIN</string>
-    <string name="pincode_mismatch">Both ownCloud App PIN are not the same</string> 
-    <string name="pincode_wrong">Incorrect ownCloud App PIN</string>
-    <string name="pincode_removed">ownCloud App PIN removed</string>
-    <string name="pincode_stored">ownCloud App PIN stored</string>
+    <string name="pincode_reenter_your_pincode">Please, reenter your App PIN</string>
+    <string name="pincode_remove_your_pincode">Remove your App PIN</string>
+    <string name="pincode_mismatch">The App PINs are not the same</string> 
+    <string name="pincode_wrong">Incorrect App PIN</string>
+    <string name="pincode_removed">App PIN removed</string>
+    <string name="pincode_stored">App PIN stored</string>
     
     <string-array name="prefs_trackmydevice_intervall_keys">
     	<item>15 Minutes</item>
@@ -143,25 +142,25 @@
 	</string-array>
     <string name="auth_trying_to_login">Trying to login…</string>
     <string name="auth_no_net_conn_title">No network connection</string>
-    <string name="auth_no_net_conn_message">No network connection have been detected, check your Internet connection and try again.</string>
+    <string name="auth_no_net_conn_message">No network connection has been detected, check your Internet connection and try again.</string>
     <string name="auth_connect_anyway">Connect anyway</string>
     <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
-    <string name="auth_nossl_plain_ok_message">Application couldn\'t establish a secure connection to server. Although non secure connection is available. You may continue or cancel.</string>
+    <string name="auth_nossl_plain_ok_message">The Application cannot establish a secure connection to the server. A non secure connection is available. You may continue or cancel.</string>
     <string name="auth_connection_established">Connection established</string>
     <string name="auth_testing_connection">Testing connection…</string>
-    <string name="auth_not_configured_title">Malformed ownCloud configuration</string>
-    <string name="auth_not_configured_message">It seems that your ownCloud instance is not correctly configured. Contact your administrator for more details.</string>
+    <string name="auth_not_configured_title">Malformed server configuration</string>
+    <string name="auth_not_configured_message">It seems that your server instance is not correctly configured. Contact your administrator for more details.</string>
     <string name="auth_unknown_error_title">Unknown error occurred!</string>
-    <string name="auth_unknown_error_message">Unknown error occurred. Please contact authors and include logs from your device.</string>
+    <string name="auth_unknown_error_message">An unknown error occurred. Please contact support and include logs from your device.</string>
     <string name="auth_unknown_host_title">Couldn\'t find host</string>
     <string name="auth_unknown_host_message">Couldn\'t find the entered host. Please check hostname and server availability and try again.</string>
-    <string name="auth_incorrect_path_title">ownCloud instance not found</string>
-    <string name="auth_incorrect_path_message">Application couldn\'t find ownClound instance at given path. Please check your path and try again.</string>
+    <string name="auth_incorrect_path_title">Server instance not found</string>
+    <string name="auth_incorrect_path_message">Application couldn\'t find a server instance at the given path. Please check your path and try again.</string>
     <string name="auth_timeout_title">The server took too long to respond</string>
     <string name="auth_incorrect_address_title">Malformed URL</string>
 	<string name="auth_ssl_general_error_title">SSL initialization failed</string>
 	<string name="auth_ssl_unverified_server_title">Unverified SSL server\'s identity</string>
-	<string name="auth_bad_oc_version_title">Unrecognized ownCloud server version</string>
+	<string name="auth_bad_oc_version_title">Unrecognized server version</string>
 	<string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
 	<string name="auth_secure_connection">Secure connection established</string>
     <string name="auth_login_details">Login details</string>
@@ -169,12 +168,12 @@
     <string name="auth_not_found">Wrong path given</string>
     <string name="auth_internal">Internal server error, code %1$d</string>
     
-    <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit crash report?</string>
+    <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
     <string name="crashlog_send_report">Send report</string>
     <string name="crashlog_dont_send_report">Don\'t send report</string>
     
     <string name="extensions_avail_title">Extensions available!</string>
-    <string name="extensions_avail_message">Looks like your ownCloud instance is supporting advanced extensions. Would you like to see extensions available for android ?</string>
+    <string name="extensions_avail_message">Looks like your server instance is supporting advanced extensions. Would you like to see extensions available for android ?</string>
     <string name="fd_keep_in_sync">Keep file up to date</string>
     <string name="common_share">Share</string>
     <string name="common_rename">Rename</string>
@@ -187,11 +186,11 @@
 	  <string name="confirmation_remove_remote">Remove from server</string>
 	  <string name="confirmation_remove_remote_and_local">Remote and local</string>
 
-    <string name="remove_success_msg">"Successful removal"</string>
-    <string name="remove_fail_msg">"Removal could not be completed"</string>
+    <string name="remove_success_msg">"Removal succeeded"</string>
+    <string name="remove_fail_msg">"Removal failed"</string>
     
     <string name="rename_dialog_title">Enter a new name</string>
-    <string name="rename_local_fail_msg">"Local copy could not be renamed; try a differente new name"</string>
+    <string name="rename_local_fail_msg">"Local copy could not be renamed; try a different name"</string>
     <string name="rename_server_fail_msg">"Rename could not be completed"</string>
         
     <string name="sync_file_fail_msg">Remote file could not be checked</string> 
@@ -201,14 +200,14 @@
     
     <string name="wait_a_moment">Wait a moment</string>
 	
-    <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please, try other app to select the file"</string>
+    <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</string>
     <string name="filedisplay_no_file_selected">No file was selected</string>
     
     <string name="ssl_validator_title">Warning</string>
     <string name="ssl_validator_header">The identity of the site could not be verified</string>
     <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>
     <string name="ssl_validator_reason_cert_expired">- The server certificate expired</string>
-    <string name="ssl_validator_reason_cert_not_yet_valid">- The server certificate is too young</string>
+    <string name="ssl_validator_reason_cert_not_yet_valid">- The server certificate valid dates are in the future</string>
     <string name="ssl_validator_reason_hostname_not_verified">- The URL does not match the hostname in the certificate</string>
     <string name="ssl_validator_certificate_not_available">The server certificate could not be obtained</string>
     <string name="ssl_validator_question">Do you want to trust this certificate anyway?</string>
@@ -232,6 +231,8 @@
     <string name="text_placeholder">This is a placeholder</string>
     
     <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
+	<string name="instant_upload_path">/InstantUpload</string>
+    
     <string name="conflict_title">Update conflict</string>
     <string name="conflict_message">Remote file %s is not synchronized with local file. Continuing will replace content of file on server.</string>
     <string name="conflict_keep_both">Keep both</string>
diff --git a/res/values/urls.xml b/res/values/urls.xml
new file mode 100644
index 00000000..b4098270
--- /dev/null
+++ b/res/values/urls.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="url_account_register">"https://owncloud.com/mobile/new"</string>
+</resources>
\ No newline at end of file
diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 7b661496..b21a024b 100644
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -129,7 +129,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         case DIALOG_NO_ACCOUNT:
             builder.setIcon(android.R.drawable.ic_dialog_alert);
             builder.setTitle(R.string.uploader_wrn_no_account_title);
-            builder.setMessage(R.string.uploader_wrn_no_account_text);
+            builder.setMessage(String.format(getString(R.string.uploader_wrn_no_account_text), getString(R.string.app_name)));
             builder.setCancelable(false);
             builder.setPositiveButton(R.string.uploader_wrn_no_account_setup_btn_text, new OnClickListener() {
                 @Override
@@ -432,7 +432,8 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
             finish();
             
         } catch (SecurityException e) {
-            Toast.makeText(this, getString(R.string.uploader_error_forbidden_content), Toast.LENGTH_LONG).show();
+            String message = String.format(getString(R.string.uploader_error_forbidden_content), getString(R.string.app_name));
+            Toast.makeText(this, message, Toast.LENGTH_LONG).show();            
         }
     }
 
diff --git a/src/com/owncloud/android/location/LocationUpdateService.java b/src/com/owncloud/android/location/LocationUpdateService.java
index 6e3dfb83..298d15b6 100644
--- a/src/com/owncloud/android/location/LocationUpdateService.java
+++ b/src/com/owncloud/android/location/LocationUpdateService.java
@@ -57,9 +57,10 @@ public class LocationUpdateService extends IntentService implements
 
         // Notify user if there is no way to track the device
         if (mLocationProvider == null) {
+            String message = String.format(getString(R.string.location_no_provider), getString(R.string.app_name));
             Toast.makeText(this,
-                    R.string.location_no_provider,
-                    Toast.LENGTH_LONG);
+                    message,
+                    Toast.LENGTH_LONG).show();
             stopSelf();
             return;
         }
diff --git a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
index c26c0042..7321f6a5 100644
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
@@ -54,6 +54,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnFocusChangeListener;
 import android.view.Window;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.owncloud.android.R;
@@ -125,6 +126,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         iv2.setOnClickListener(this);
         tv.setOnFocusChangeListener(this);
         tv2.setOnFocusChangeListener(this);
+
+        Button b = (Button) findViewById(R.id.account_register);
+        if (b != null) {
+            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));
+        }
     }
 
     @Override
@@ -299,7 +305,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
     
     public void onRegisterClick(View view) {
-        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse("https://owncloud.com/mobile/new"));
+        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));
         setResult(RESULT_CANCELED);
         startActivity(register);
     }
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 4a5b5cb3..1a2ad46c 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -591,7 +591,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     dialog.dismiss();
                 }
             });
-            builder.setNegativeButton(R.string.common_exit, new OnClickListener() {
+            String message = String.format(getString(R.string.common_exit), getString(R.string.app_name));
+            builder.setNegativeButton(message, new OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {
                     dialog.dismiss();
                     finish();
@@ -607,7 +608,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             PackageInfo pkg;
             try {
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
-                builder.setMessage(String.format(getString(R.string.about_message), pkg.versionName));
+                builder.setMessage(String.format(getString(R.string.about_message), getString(R.string.app_name), pkg.versionName));
                 builder.setIcon(android.R.drawable.ic_menu_info_details);
                 dialog = builder.create();
             } catch (NameNotFoundException e) {
-- 
2.11.0