diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_app_google__chrome__strings.grd')
-rw-r--r-- | www/chromium/files/patch-chrome_app_google__chrome__strings.grd | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd index 064f31b18f22..d7500c7e45d4 100644 --- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,15 @@ ---- chrome/app/google_chrome_strings.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/google_chrome_strings.grd.orig 2019-04-30 22:22:30 UTC +++ chrome/app/google_chrome_strings.grd -@@ -820,7 +820,7 @@ Signing in anyway will merge Chrome information like b +@@ -701,7 +701,7 @@ Signing in anyway will merge Chrome information like b + </if> + + <!-- about:browser-switch strings --> +- <if expr="is_win or is_macosx or (is_linux and not is_chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not is_chromeos)"> + <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION" desc="Description shown while waiting for an alternative browser to open"> + Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. + </message> +@@ -827,7 +827,7 @@ Signing in anyway will merge Chrome information like b </message> <!-- ProcessSingleton --> @@ -9,7 +18,7 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. </message> -@@ -1075,7 +1075,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 +@@ -1082,7 +1082,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 </message> <!-- Plugin Placeholders --> |