Bug 664774 - Loading and Install text has mixed capitalization. r=mfinkle
authorDoug Turner <dougt@dougt.org>
Thu, 16 Jun 2011 11:49:38 -0700
changeset 71698 9a4d38add60a723f81e53c5d330fac11a0ab32b5
parent 71697 8c5e954a80b8e5c6e4794907320650f5ed3df60c
child 71699 01213e2cc7d00b74f310b244d4fac72374b9156d
push id159
push usereakhgari@mozilla.com
push dateTue, 16 Aug 2011 17:53:11 +0000
treeherdermozilla-beta@8786e3e49240 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs664774
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 664774 - Loading and Install text has mixed capitalization. r=mfinkle
embedding/android/GeckoApp.java
embedding/android/locales/en-US/android_strings.dtd
embedding/android/strings.xml.in
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -134,17 +134,17 @@ abstract public class GeckoApp
         new Thread() {
             public void run() {
                 long startup_time = System.currentTimeMillis();
                 try {
                     if (mLibLoadThread != null)
                         mLibLoadThread.join();
                 } catch (InterruptedException ie) {}
                 surfaceView.mSplashStatusMsg =
-                    getResources().getString(R.string.splash_screen_label);
+                    getResources().getString(R.string.splash_screen_loading);
                 surfaceView.drawSplashScreen();
                 // unpack files in the components directory
                 try {
                     unpackComponents();
                 } catch (FileNotFoundException fnfe) {
                     Log.e("GeckoApp", "error unpacking components", fnfe);
                     Looper.prepare();
                     showErrorDialog(getString(R.string.error_loading_file));
@@ -255,20 +255,20 @@ abstract public class GeckoApp
         File cacheFile = GeckoAppShell.getCacheDir();
         File libxulFile = new File(cacheFile, "libxul.so");
 
         if (GeckoAppShell.getFreeSpace() > GeckoAppShell.kFreeSpaceThreshold &&
             (!libxulFile.exists() ||
              new File(getApplication().getPackageResourcePath()).lastModified()
              >= libxulFile.lastModified()))
             surfaceView.mSplashStatusMsg =
-                getResources().getString(R.string.splash_screen_installing);
+                getResources().getString(R.string.splash_screen_installing_libs);
         else
             surfaceView.mSplashStatusMsg =
-                getResources().getString(R.string.splash_screen_label);
+                getResources().getString(R.string.splash_screen_loading);
         mLibLoadThread.start();
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
         if (checkLaunchState(LaunchState.GeckoExiting)) {
             // We're exiting and shouldn't try to do anything else just incase
             // we're hung for some reason we'll force the process to exit
--- a/embedding/android/locales/en-US/android_strings.dtd
+++ b/embedding/android/locales/en-US/android_strings.dtd
@@ -1,11 +1,13 @@
-<!ENTITY  splash_screen_label "loading">
-<!ENTITY  splash_screen_installing "installing libraries\u2026">
+
+<!ENTITY  splash_screen_loading "Loading">
+<!ENTITY  splash_screen_installing_libs "Installing libraries\u2026">
 <!ENTITY  splash_firstrun "Setting up &brandShortName;\u2026">
+
 <!ENTITY  no_space_to_start_error "There is not enough space available for &brandShortName; to start.">
 <!ENTITY  error_loading_file "An error occurred when trying to load files required to run &brandShortName;">
 
 <!ENTITY  crash_reporter_title "&brandShortName; Crash Reporter">
 <!ENTITY  crash_message "&brandShortName; has crashed. Your tabs should be listed on the &brandShortName; Start page when you restart.">
 <!ENTITY  crash_help_message "Please help us fix this problem!">
 <!ENTITY  crash_send_report_message "Send Mozilla a crash report">
 <!ENTITY  crash_include_url "Include page address">
--- a/embedding/android/strings.xml.in
+++ b/embedding/android/strings.xml.in
@@ -1,17 +1,17 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE resources [
 #includesubst @BRANDPATH@
 #includesubst @STRINGSPATH@
 ]>
 <resources>
-  <string name="splash_screen_label">&splash_screen_label;</string>
-  <string name="splash_screen_installing">&splash_screen_installing;</string>
+  <string name="splash_screen_loading">&splash_screen_loading;</string>
+  <string name="splash_screen_installing_libs">&splash_screen_installing_libs;</string>
   <string name="splash_firstrun">&splash_firstrun;</string>
   <string name="no_space_to_start_error">&no_space_to_start_error;</string>
   <string name="error_loading_file">&error_loading_file;</string>
 
   <string name="crash_reporter_title">&crash_reporter_title;</string>
   <string name="crash_message">&crash_message;</string>
   <string name="crash_help_message">&crash_help_message;</string>
   <string name="crash_send_report_message">&crash_send_report_message;</string>