Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06d03a91 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Browser: Rename all Chrome/Bromite strings

parent 4fc159ac
Loading
Loading
Loading
Loading
+12 −14
Original line number Original line Diff line number Diff line
@@ -126,20 +126,18 @@ patch() {
rename() {
rename() {
    cd $chromium_dir/src
    cd $chromium_dir/src


    # Translation directories
    replacements=("Chrome browser=Browser" "Chrome=Browser" "Bromite=Browser" "Cromite=Browser")
    dirs="components components/strings chrome/browser/ui/android/strings chrome/browser/ui/android/strings/translations"


    for replacement in "${replacements[@]}"; do
    for dir in $dirs; do
        replaced_string=${replacement%%=*}
        grdp_files=$(ls $dir/*.grdp 2> /dev/null | wc -l)
        replacement_string=${replacement#*=}
        if [ "$grdp_files" != "0" ]; then

	    sed -i 's/Chrome browser/Browser/g' $dir/*.grd*
        find . -type f -not -name 'foundation_e.grdp' -name '*.grd*' | while read -r filename; do
	    sed -i 's/Chrome/Browser/g' $dir/*.grd*
            sed -i "s/\b${replaced_string}\b/${replacement_string}/g" "$filename"
        fi
        done
        xtb_files=$(ls $dir/*.xtb 2> /dev/null | wc -l)
        find . -type f -name '*.xtb' | while read -r filename; do
        if [ "$xtb_files" != "0" ]; then
            sed -i "s/\b${replaced_string}\b/${replacement_string}/g" "$filename"
	    sed -i 's/Chrome browser/Browser/g' $dir/*.xtb
        done
	    sed -i 's/Chrome/Browser/g' $dir/*.xtb
        fi
    done
    done


    git add .
    git add .
+10 −168
Original line number Original line Diff line number Diff line
From b19a94fc328a15e3245bb8fa34bd4b77e2b9df46 Mon Sep 17 00:00:00 2001
From 5e2390f97a7b133054392b2b98bfbc4ed9bf62a8 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <theimpulson@e.email>
From: Aayush Gupta <theimpulson@e.email>
Date: Fri, 26 Nov 2021 07:12:30 +0000
Date: Fri, 26 Nov 2021 07:12:30 +0000
Subject: [PATCH] Browser: Rename strings to browser
Subject: [PATCH] Browser: Rename strings to browser


Signed-off-by: Aayush Gupta <theimpulson@e.email>
Signed-off-by: Aayush Gupta <theimpulson@e.email>
---
---
 .../java/res/layout/manage_space_activity.xml |  6 +--
 .../android/java/res/xml/about_chrome_preferences.xml  |  3 +++
 ...radio_button_group_homepage_preference.xml |  4 +-
 .../browser/about_settings/AboutChromeSettings.java    |  8 ++++----
 .../java/res/xml/about_chrome_preferences.xml |  3 ++
 .../ui/android/strings/android_chrome_strings.grd      |  2 ++
 .../android/java/res/xml/main_preferences.xml |  2 +-
 chrome/browser/ui/android/strings/foundation_e.grdp    | 10 ++++++++++
 .../about_settings/AboutChromeSettings.java   | 10 ++--
 4 files changed, 19 insertions(+), 4 deletions(-)
 .../site_settings/ManageSpaceActivity.java    |  6 +--
 .../WebContentsDarkModeMessageController.java |  2 +-
 .../strings/android_chrome_strings.grd        |  2 +
 .../ui/android/strings/foundation_e.grdp      | 49 +++++++++++++++++++
 9 files changed, 69 insertions(+), 15 deletions(-)
 create mode 100644 chrome/browser/ui/android/strings/foundation_e.grdp
 create mode 100644 chrome/browser/ui/android/strings/foundation_e.grdp


diff --git a/chrome/android/java/res/layout/manage_space_activity.xml b/chrome/android/java/res/layout/manage_space_activity.xml
index 58206529e71f5..d863289ff218b 100644
--- a/chrome/android/java/res/layout/manage_space_activity.xml
+++ b/chrome/android/java/res/layout/manage_space_activity.xml
@@ -26,7 +26,7 @@ found in the LICENSE file.
         <!-- ======== 'Unimportant Storage' Info ======== -->
         <TextView
             android:id="@+id/unimportant_site_data_description"
-            android:text="@string/storage_management_unimportant_site_data_description"
+            android:text="@string/storage_management_unimportant_site_data_description_e"
             style="@style/ManageSpaceActivityExplanationTextView" />
 
         <LinearLayout
@@ -86,7 +86,7 @@ found in the LICENSE file.
 
         <TextView
             android:id="@+id/all_storage_description"
-            android:text="@string/storage_management_all_storage_description"
+            android:text="@string/storage_management_all_storage_description_e"
             android:paddingTop="12dp"
             style="@style/ManageSpaceActivityExplanationTextView" />
 
@@ -95,4 +95,4 @@ found in the LICENSE file.
             android:text="@string/storage_management_clear_all_data_button"
                 style="@style/ManageSpaceActivityButton" />
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/chrome/android/java/res/layout/radio_button_group_homepage_preference.xml b/chrome/android/java/res/layout/radio_button_group_homepage_preference.xml
index b2d911cbdf2cb..918568eea451d 100644
--- a/chrome/android/java/res/layout/radio_button_group_homepage_preference.xml
+++ b/chrome/android/java/res/layout/radio_button_group_homepage_preference.xml
@@ -35,7 +35,7 @@ found in the LICENSE file.
         android:id="@+id/radio_button_chrome_ntp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:primaryText="@string/options_homepage_chrome_homepage" />
+        app:primaryText="@string/options_homepage_chrome_homepage_e" />
 
     <org.chromium.components.browser_ui.widget.RadioButtonWithEditText
         android:id="@+id/radio_button_uri_edit"
@@ -45,4 +45,4 @@ found in the LICENSE file.
         android:inputType="textUri" />
 
   </org.chromium.components.browser_ui.widget.RadioButtonWithDescriptionLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/android/java/res/xml/about_chrome_preferences.xml
diff --git a/chrome/android/java/res/xml/about_chrome_preferences.xml b/chrome/android/java/res/xml/about_chrome_preferences.xml
index fb1dfed23052b..d5092508ce452 100644
index fb1dfed23052b..d5092508ce452 100644
--- a/chrome/android/java/res/xml/about_chrome_preferences.xml
--- a/chrome/android/java/res/xml/about_chrome_preferences.xml
@@ -80,20 +26,8 @@ index fb1dfed23052b..d5092508ce452 100644
     <org.chromium.chrome.browser.about_settings.LongClickCopySummaryPreference
     <org.chromium.chrome.browser.about_settings.LongClickCopySummaryPreference
         android:key="application_version"
         android:key="application_version"
         android:title="@string/application_version_title" />
         android:title="@string/application_version_title" />
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
index bb75f9a8e384c..6106cd3a807be 100644
--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -110,6 +110,6 @@
         android:fragment="org.chromium.chrome.browser.about_settings.AboutChromeSettings"
         android:key="about_chrome"
         android:order="24"
-        android:title="@string/prefs_about_chrome"/>
+        android:title="@string/prefs_about_chrome_e"/>
 
 </PreferenceScreen>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
index f59f62fdf971b..9cf0cb7918b9f 100644
index f59f62fdf971b..b21f56b38c685 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/about_settings/AboutChromeSettings.java
@@ -30,7 +30,7 @@ public class AboutChromeSettings
@@ -30,7 +30,7 @@ public class AboutChromeSettings
@@ -105,15 +39,6 @@ index f59f62fdf971b..9cf0cb7918b9f 100644
 
 
     // Non-translated strings:
     // Non-translated strings:
     private static final String MSG_DEVELOPER_ENABLE_COUNTDOWN =
     private static final String MSG_DEVELOPER_ENABLE_COUNTDOWN =
@@ -47,7 +47,7 @@ public class AboutChromeSettings
 
     @Override
     public void onCreatePreferences(Bundle bundle, String s) {
-        getActivity().setTitle(R.string.prefs_about_chrome);
+        getActivity().setTitle(R.string.prefs_about_chrome_e);
         SettingsUtils.addPreferencesFromResource(this, R.xml.about_chrome_preferences);
 
         Preference p = findPreference(PREF_APPLICATION_VERSION);
@@ -56,9 +56,9 @@ public class AboutChromeSettings
@@ -56,9 +56,9 @@ public class AboutChromeSettings
         p.setOnPreferenceClickListener(this);
         p.setOnPreferenceClickListener(this);
         p = findPreference(PREF_OS_VERSION);
         p = findPreference(PREF_OS_VERSION);
@@ -127,50 +52,6 @@ index f59f62fdf971b..9cf0cb7918b9f 100644
     }
     }
 
 
     /**
     /**
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java
index b1a41e7371fc8..d5feb829e45cd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java
@@ -76,7 +76,7 @@ public class ManageSpaceActivity extends AppCompatActivity implements View.OnCli
 
         setContentView(R.layout.manage_space_activity);
         Resources r = getResources();
-        setTitle(String.format(r.getString(R.string.storage_management_activity_label),
+        setTitle(String.format(r.getString(R.string.storage_management_activity_label_e),
                 r.getString(R.string.app_name)));
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -218,7 +218,7 @@ public class ManageSpaceActivity extends AppCompatActivity implements View.OnCli
                 });
                 builder.setNegativeButton(R.string.cancel, null);
                 builder.setTitle(R.string.storage_delete_site_storage_title);
-                builder.setMessage(R.string.storage_management_clear_unimportant_dialog_text);
+                builder.setMessage(R.string.storage_management_clear_unimportant_dialog_text_e);
                 mUnimportantDialog = builder.create();
             }
             mUnimportantDialog.show();
@@ -246,7 +246,7 @@ public class ManageSpaceActivity extends AppCompatActivity implements View.OnCli
             });
             builder.setNegativeButton(R.string.cancel, null);
             builder.setTitle(R.string.storage_management_reset_app_dialog_title);
-            builder.setMessage(R.string.storage_management_reset_app_dialog_text);
+            builder.setMessage(R.string.storage_management_reset_app_dialog_text_e);
             builder.create().show();
         }
     }
diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
index df8e8db6bc4be..d404ab97e5515 100644
--- a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
+++ b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
@@ -130,7 +130,7 @@ public class WebContentsDarkModeMessageController {
                         .with(MessageBannerProperties.ICON_TINT_COLOR,
                                 MessageBannerProperties.TINT_NONE)
                         .with(MessageBannerProperties.TITLE,
-                                resources.getString(R.string.auto_dark_message_title))
+                                resources.getString(R.string.auto_dark_message_title_e))
                         .with(MessageBannerProperties.DESCRIPTION, description)
                         .with(MessageBannerProperties.PRIMARY_BUTTON_TEXT,
                                 resources.getString(R.string.auto_dark_message_button))
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 9354ba7b6beef..7ae63f7eb0b36 100644
index 9354ba7b6beef..7ae63f7eb0b36 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -186,58 +67,19 @@ index 9354ba7b6beef..7ae63f7eb0b36 100644
        <!-- Cookie Controls -->
        <!-- Cookie Controls -->
diff --git a/chrome/browser/ui/android/strings/foundation_e.grdp b/chrome/browser/ui/android/strings/foundation_e.grdp
diff --git a/chrome/browser/ui/android/strings/foundation_e.grdp b/chrome/browser/ui/android/strings/foundation_e.grdp
new file mode 100644
new file mode 100644
index 0000000000000..4a1cb69ff7c46
index 0000000000000..49da40abd38e7
--- /dev/null
--- /dev/null
+++ b/chrome/browser/ui/android/strings/foundation_e.grdp
+++ b/chrome/browser/ui/android/strings/foundation_e.grdp
@@ -0,0 +1,49 @@
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+<grit-part>
+
+  <!-- Homepage UI strings -->
+  <message name="IDS_OPTIONS_HOMEPAGE_CHROME_HOMEPAGE_E" desc="The option that allows user to set Chrome's new tab page as the homepage." >
+    Browser’s homepage
+  </message>
+
+  <!-- Tablet UI strings -->
+  <message name="IDS_FORCE_TABLET_UI_SUMMARY_E" desc="Summary of the preference that allows the user to force chromium to use tablet UI.">
+    Open browser in Tablet Mode
+  </message>
+
+  <!-- About UI strings -->
+  <message name="IDS_PREFS_ABOUT_CHROME_E" desc="Title for the About Chrome page. [CHAR-LIMIT=32]">
+    About Browser
+  </message>
+
+  <!-- Storage Preference UI strings for clearing storage. -->
+  <message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL_E" desc="Title for Chrome's Manage Space Activity.">
+    <ph name="APP_NAME">%1$s<ex>Chrome</ex></ph> storage
+  </message>
+  <message name="IDS_STORAGE_MANAGEMENT_UNIMPORTANT_SITE_DATA_DESCRIPTION_E" desc="Text to describe the data stored by unimportant or infrequent sites.">
+    Stored data that Browser doesn't think is important (e.g. sites with no saved settings or that you don't visit often)
+  </message>
+  <message name="IDS_STORAGE_MANAGEMENT_CLEAR_UNIMPORTANT_DIALOG_TEXT_E" desc="Text of the clear unimportant site data dialog in the storage UI.">
+    This will clear cookies, cache, and other data of sites Browser doesn't think is important.
+  </message>
+  <message name="IDS_STORAGE_MANAGEMENT_ALL_STORAGE_DESCRIPTION_E" desc="Text used to describe all storage space used by Chrome.">
+    Total data used by Browser, including accounts, bookmarks, and saved settings
+  </message>
+  <message name="IDS_STORAGE_MANAGEMENT_RESET_APP_DIALOG_TEXT_E" desc="Text of the reset app dialoag in the storage UI.">
+    All Browser’s app data will be deleted permanently. This includes all files, settings, accounts, databases, etc.
+  </message>
+
+  <!-- About UI strings -->
+  <!-- About UI strings -->
+  <message name="IDS_E_BROWSER_INFORMATION_TITLE" desc="Title for /e/OS Browser information ">
+  <message name="IDS_E_BROWSER_INFORMATION_TITLE" desc="Title for /e/OS Browser information ">
+    /e/OS browser information
+    /e/OS browser information
+  </message>
+  </message>
+  <message name="IDS_E_BROWSER_INFORMATION" desc="/e/OS Browser information ">
+  <message name="IDS_E_BROWSER_INFORMATION" desc="/e/OS Browser information ">
+    The /e/OS browser is a fork of Bromite.\n\t\n\tThe /e/OS browser adds settings such as:\n\t- Different default search engines\n\t- Async DNS disabled by default\n\t- Do-not-track-enabled by default\n\t- Launcher search engine integration\n\t- User agent spoofed by default\n\t- Unified autoplay enabled by default\n\t- Adaptive launcher and recent icons
+    The /e/OS browser is a fork of Cromite.\n\t\n\tThe /e/OS browser adds settings such as:\n\t- Different default search engines\n\t- Async DNS disabled by default\n\t- Do-not-track-enabled by default\n\t- Launcher search engine integration\n\t- User agent spoofed by default\n\t- Unified autoplay enabled by default\n\t- Adaptive launcher and recent icons
+  </message>
+  </message>
+
+  <!-- Auto-darken web content -->
+  <message name="IDS_AUTO_DARK_MESSAGE_TITLE_E" desc="Message shown that informs the user auto darkening of website contents has been enabled.">
+    Dark theme for sites is on in Browser
+  </message>
+
+</grit-part>
+</grit-part>
-- 
-- 
2.34.1
2.34.1