Make UI strings consistent in the 2nd person - crbug.com/156975

Make UI strings consistent in the 2nd person - crbug.com/156975

BUG=156975
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=250094

[edwardjung, 2014-02-03 13:28:27]

Hi, 

I would like a code review on some 1st to 2nd person settings string changes.

This is my first Chromium CL so let me know if there is are tests I should run
this change through.

Thanks,

Edward

[cpu_(ooo_6.6-7.5), 2014-02-03 18:20:30]

there are no tests for this. Jut have a UI person Ok the strings post-facto.

lgtm

[cpu_(ooo_6.6-7.5), 2014-02-03 18:20:37]

The CQ bit was checked by cpu@chromium.org

[commit-bot: I haz the power, 2014-02-03 18:21:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/edwardjung@chromium.org/145683002/30001

[commit-bot: I haz the power, 2014-02-03 18:21:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-03 18:21:04]

Failed to apply patch for chrome/app/generated_resources.grd:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/app/generated_resources.grd
  Hunk #1 succeeded at 7908 (offset -18 lines).
  Hunk #2 succeeded at 7923 (offset -18 lines).
  Hunk #3 succeeded at 7989 (offset -18 lines).
  Hunk #4 succeeded at 8113 (offset -18 lines).
  Hunk #5 succeeded at 8143 (offset -18 lines).
  Hunk #6 succeeded at 8188 (offset -18 lines).
  Hunk #7 succeeded at 8211 (offset -18 lines).
  Hunk #8 succeeded at 9649 (offset -132 lines).
  Hunk #9 FAILED at 10062.
  Hunk #10 FAILED at 10142.
  Hunk #11 FAILED at 10175.
  Hunk #12 FAILED at 10184.
  Hunk #13 FAILED at 10223.
  Hunk #14 FAILED at 10362.
  Hunk #15 succeeded at 10872 (offset 17 lines).
  Hunk #16 succeeded at 14220 (offset -804 lines).
  6 out of 16 hunks FAILED -- saving rejects to file
chrome/app/generated_resources.grd.rej

Patch:       chrome/app/generated_resources.grd
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd
b/chrome/app/generated_resources.grd
index
6ab805586e7cbe311059db0b768aecf38867d690..eff7965d6594d5d3ae2551e49874f026b7fc4721
100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7926,7 +7926,7 @@ The following plug-in is unresponsive: <ph
name="PLUGIN_NAME">$1
         Allow local data to be set (recommended)
       </message>
       <message name="IDS_COOKIES_SESSION_ONLY_RADIO" desc="A radio button in
the Content Settings dialog for allowing cookies and other site data for the
current session only.">
-        Keep local data only until I quit my browser
+        Keep local data only until you quit your browser
       </message>
       <message name="IDS_COOKIES_BLOCK_RADIO" desc="A radio button in the
Content Settings dialog for blocking cookies and other site data from being
stored on your computer.">
         Block sites from setting any data
@@ -7941,22 +7941,22 @@ The following plug-in is unresponsive: <ph
name="PLUGIN_NAME">$1
         Media exceptions
       </message>
       <message name="IDS_MEDIA_STREAM_BLOCK_RADIO" desc="A radio button in
Content Settings dialog to deny all sites to access any capture device.">
-        Do not allow sites to access my camera and microphone
+        Do not allow sites to access your camera and microphone
       </message>
       <message name="IDS_MEDIA_STREAM_ASK_RADIO" desc="A radio button in
Content Settings dialog to allow site to query the permision to access capture
devices.">
-        Ask me when a site requires access to my camera and microphone
(recommended)
+        Ask when a site requires access to your camera and microphone
(recommended)
       </message>
       <message name="IDS_MEDIA_STREAM_BLOCK_AUDIO_ONLY_RADIO" desc="A radio
button in Content Settings dialog to deny all sites to access audio capture
device.">
-        Do not allow sites to access my microphone
+        Do not allow sites to access your microphone
       </message>
       <message name="IDS_MEDIA_STREAM_ASK_AUDIO_ONLY_RADIO" desc="A radio
button in Content Settings dialog to allow site to query the permision to access
audio capture devices.">
-        Ask me when a site requires access to my microphone (recommended)
+        Ask when a site requires access to your microphone (recommended)
       </message>
       <message name="IDS_MEDIA_STREAM_BLOCK_VIDEO_ONLY_RADIO" desc="A radio
button in Content Settings dialog to deny all sites to access video capture
device.">
-        Do not allow sites to access my camera
+        Do not allow sites to access your camera
       </message>
       <message name="IDS_MEDIA_STREAM_ASK_VIDEO_ONLY_RADIO" desc="A radio
button in Content Settings dialog to allow site to query the permision to access
video capture devices.">
-        Ask me when a site requires access to my camera (recommended)
+        Ask when a site requires access to your camera (recommended)
       </message>
       <message name="IDS_MEDIA_STREAM_AUDIO_MANAGED" desc="A notification
bubble shown if the access to audio capture devices is controlled through
policy.">
         Access to your microphone is controlled by your administrator.
@@ -8007,26 +8007,26 @@ The following plug-in is unresponsive: <ph
name="PLUGIN_NAME">$1
       <!-- Mac and ChromeOS users do not close their browser. Mac users quit it
and ChromeOS users log out. -->
       <if expr="not is_macosx and not pp_ifdef('chromeos')">
         <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in
the Content Settings dialog for removing all cookies on when browser is
closed.">
-          Clear cookies and other site data when I close my browser
+          Clear cookies and other site data when you close your browser
         </message>
         <message name="IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX" desc="A
checkbox in the Content Settings dialog for removing all cookies on when browser
is closed.">
-          Clear cookies and other site and plug-in data when I close my browser
+          Clear cookies and other site and plug-in data when you close your
browser
         </message>
       </if>
       <if expr="is_macosx">
         <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in
the Content Settings dialog for removing all cookies on when browser is quit
(Mac).">
-          Clear cookies and other site data when I quit my browser
+          Clear cookies and other site data when you quit your browser
         </message>
         <message name="IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX" desc="A
checkbox in the Content Settings dialog for removing all cookies on when browser
is quit (Mac).">
-          Clear cookies and other site and plug-in data when I quit my browser
+          Clear cookies and other site and plug-in data when you quit your
browser
         </message>
       </if>
       <if expr="pp_ifdef('chromeos')">
         <message name="IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX" desc="A checkbox in
the Content Settings dialog for removing all cookies on when browser is
closed.">
-          Clear cookies and other site data when I log out
+          Clear cookies and other site data when you log out
         </message>
         <message name="IDS_COOKIES_LSO_CLEAR_WHEN_CLOSE_CHKBOX" desc="A
checkbox in the Content Settings dialog for removing all cookies on when browser
is closed.">
-          Clear cookies and other site and plug-in data when I log out
+          Clear cookies and other site and plug-in data when you log out
         </message>
       </if>
 
@@ -8131,13 +8131,13 @@ The following plug-in is unresponsive: <ph
name="PLUGIN_NAME">$1
         Geolocation exceptions
       </message>
       <message name="IDS_GEOLOCATION_ALLOW_RADIO" desc="A radio button in the
Content Settings dialog for allowing all sites access to geolocation data.">
-        Allow all sites to track my physical location
+        Allow all sites to track your physical location
       </message>
       <message name="IDS_GEOLOCATION_ASK_RADIO" desc="A radio button in the
Content Settings dialog for asking before allowing sites access to gelocation
data.">
-        Ask me when a site tries to track my physical location (recommended)
+        Ask when a site tries to track your physical location (recommended)
       </message>
       <message name="IDS_GEOLOCATION_BLOCK_RADIO" desc="A radio button in the
Content Settings dialog for blocking sites from accessing geolocation data.">
-        Do not allow any site to track my physical location
+        Do not allow any site to track your physical location
       </message>
       <message name="IDS_GEOLOCATION_GOOGLE_ACCESS_ENABLE_CHKBOX" desc="The
label of the 'Allow Google services to access your location' checkbox">
         Allow Google services to access your location
@@ -8161,7 +8161,7 @@ The following plug-in is unresponsive: <ph
name="PLUGIN_NAME">$1
         Do not allow any site to show desktop notifications
       </message>
       <message name="IDS_NOTIFICATIONS_ASK_RADIO" desc="A radio button in
Content Settings dialog to configure notifications per-site.">
-        Ask me when a site wants to show desktop notifications (recommended)
+        Ask when a site wants to show desktop notifications (recommended)
       </message>
       <message name="IDS_FULLSCREEN_TAB_LABEL" desc="Label for Fullscreen tab
on Content Settings dialog">
         Fullscreen
@@ -8206,7 +8206,7 @@ The following plug-in is unresponsive: <ph
name="PLUGIN_NAME">$1
         Allow all sites to disable the mouse cursor
       </message>
       <message name="IDS_MOUSE_LOCK_ASK_RADIO" desc="A radio button in the
Content Settings dialog for asking before allowing sites to disable the mouse
cursor.">
-        Ask me when a site tries to disable the mouse cursor (recommended)
+        Ask when a site tries to disable the mouse cursor (recommended)
       </message>
       <message name="IDS_MOUSE_LOCK_BLOCK_RADIO" desc="A radio button in the
Content Settings dialog for blocking all sites ability to disable the mouse
cursor.">
         Do not allow any site to disable the mouse cursor
@@ -8229,13 +8229,13 @@ The following plug-in is unresponsive: <ph
name="PLUGIN_NAME">$1
         Unsandboxed plug-in access
       </message>
       <message name="IDS_PPAPI_BROKER_ALLOW_RADIO" desc="A radio button in
Content Settings dialog to allow all sites to access the PPAPI broker.">
-        Allow all sites to use a plug-in to access my computer
+        Allow all sites to use a plug-in to access your computer
       </message>
       <message name="IDS_PPAPI_BROKER_BLOCK_RADIO" desc="A radio button in
Content Settings dialog to deny all sites to access the PPAPI broker.">
-        Do not allow any sites to use a plug-in to access my computer
+        Do not allow any sites to use a plug-in to access your computer
       </message>
       <message name="IDS_PPAPI_BROKER_ASK_RAD…
(message too large)

[commit-bot: I haz the power, 2014-02-03 18:21:07]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-02-03 18:21:13]

CQ bit was unchecked on CL. Ignoring.

[edwardjung, 2014-02-04 10:14:45]

Adding Glen and Jenn for an LGTM on the strings per cpu.

@cpu do you happen to know which milestone this would land in? The Privacy and
Help Center teams need this info in order to schedule updates to the Privacy
policy / Help Center articles.

Thanks.

[edwardjung, 2014-02-05 13:25:19]

I saw there was a merge conflict error when this was placed on the commit queue.
I've fixed those issues now.

Thanks.

Edward

[edwardjung, 2014-02-06 11:28:02]

The CQ bit was checked by edwardjung@chromium.org

[edwardjung, 2014-02-06 11:28:25]

The CQ bit was unchecked by edwardjung@chromium.org

[edwardjung, 2014-02-06 11:28:44]

The CQ bit was checked by edwardjung@chromium.org

[commit-bot: I haz the power, 2014-02-06 11:29:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/edwardjung@chromium.org/145683002/190001

[commit-bot: I haz the power, 2014-02-06 11:48:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-06 11:48:47]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[Glen Murphy, 2014-02-06 17:15:51]

LGTM with two nits.

https://codereview.chromium.org/145683002/diff/190001/chrome/app/generated_re...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/145683002/diff/190001/chrome/app/generated_re...
chrome/app/generated_resources.grd:9980: +          Make <ph
name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> your default browser
I think this should be "Make <ph name="PRODUCT_NAME">$1<ex>Google
Chrome</ex></ph> the default browser"

https://codereview.chromium.org/145683002/diff/190001/chrome/app/generated_re...
chrome/app/generated_resources.grd:14217: +      Make it your default browser
This should probably be "Make <ph name="PRODUCT_NAME">$1<ex>Google
Chrome</ex></ph> the default browser"

[edwardjung, 2014-02-07 10:59:23]

Fixed nits.

Presubmits failed due to new policy on avoiding the use of PRODUCT_NAME
placeholders. The affected lines have been move to google_chrome_strings and
chromium_strings and added to this CL.

https://codereview.chromium.org/145683002/diff/190001/chrome/app/generated_re...
File chrome/app/generated_resources.grd (right):

https://codereview.chromium.org/145683002/diff/190001/chrome/app/generated_re...
chrome/app/generated_resources.grd:9980: +          Make <ph
name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> your default browser
On 2014/02/06 17:15:51, Glen Murphy wrote:
> I think this should be "Make <ph name="PRODUCT_NAME">$1<ex>Google
> Chrome</ex></ph> the default browser"

Done. String is now in chromium_strings / google_chrome_strings.

https://codereview.chromium.org/145683002/diff/190001/chrome/app/generated_re...
chrome/app/generated_resources.grd:14217: +      Make it your default browser
On 2014/02/06 17:15:51, Glen Murphy wrote:
> This should probably be "Make <ph name="PRODUCT_NAME">$1<ex>Google
> Chrome</ex></ph> the default browser"

Done. String is now in chromium_strings / google_chrome_strings

[edwardjung, 2014-02-10 10:34:07]

The CQ bit was checked by edwardjung@chromium.org

[commit-bot: I haz the power, 2014-02-10 10:34:24]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/edwardjung@chromium.org/145683002/430001

[commit-bot: I haz the power, 2014-02-10 14:20:26]

Change committed as 250094