Replaces 'mobile device' with 'device' for string resources to make sense on other kinds of devices

Replaces 'mobile device' with 'device' for string resources to make sense on other kinds of devices

A couple of exceptions:
'... for your computer and mobile devices' -> 'computer and other devices'
'For mobile device' -> 'For Android device'
   These occur in the field 'desc', so don't affect the translation. They
   are all about Android device and 'Android device' seems better than
   just 'For device' to me.

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

[newt (away), 2013-06-03 15:20:28]

one change requested, then lgtm

https://codereview.chromium.org/15980011/diff/1/chrome/app/generated_resource...
File chrome/app/generated_resources.grd (left):

https://codereview.chromium.org/15980011/diff/1/chrome/app/generated_resource...
chrome/app/generated_resources.grd:6106: -        <message
name="IDS_POLICY_SCOPE_DEVICE" desc="Mobile: Text displayed in the Applies To
column when a policy applies to everyone on the mobile device.">
this should be combined with the pp_ifdef('chromeos') string above.

[Jinsuk Kim, 2013-06-04 01:16:40]

Thanks!

https://codereview.chromium.org/15980011/diff/1/chrome/app/generated_resource...
File chrome/app/generated_resources.grd (left):

https://codereview.chromium.org/15980011/diff/1/chrome/app/generated_resource...
chrome/app/generated_resources.grd:6106: -        <message
name="IDS_POLICY_SCOPE_DEVICE" desc="Mobile: Text displayed in the Applies To
column when a policy applies to everyone on the mobile device.">
On 2013/06/03 15:20:28, newt wrote:
> this should be combined with the pp_ifdef('chromeos') string above.

Done.

[commit-bot: I haz the power, 2013-06-04 01:27:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jinsukkim@chromium.org/15980011/4001

[commit-bot: I haz the power, 2013-06-04 01:27:59]

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 #5 succeeded at 6086 (offset -11 lines).
  Hunk #6 FAILED at 6216.
  Hunk #7 succeeded at 7441 (offset 30 lines).
  Hunk #8 succeeded at 8705 (offset 24 lines).
  Hunk #9 succeeded at 9126 (offset 24 lines).
  Hunk #10 succeeded at 9141 (offset 24 lines).
  Hunk #11 succeeded at 9166 (offset 24 lines).
  Hunk #12 succeeded at 9385 (offset 24 lines).
  Hunk #13 succeeded at 9489 (offset 24 lines).
  Hunk #14 succeeded at 9512 (offset 24 lines).
  Hunk #15 succeeded at 10400 (offset 27 lines).
  Hunk #16 succeeded at 10762 (offset 31 lines).
  Hunk #17 succeeded at 10782 (offset 31 lines).
  Hunk #18 succeeded at 11211 (offset 43 lines).
  Hunk #19 succeeded at 11293 (offset 43 lines).
  Hunk #20 succeeded at 11302 (offset 43 lines).
  Hunk #21 succeeded at 11338 (offset 43 lines).
  Hunk #22 succeeded at 11703 (offset 46 lines).
  Hunk #23 succeeded at 11735 (offset 46 lines).
  Hunk #24 succeeded at 11822 (offset 46 lines).
  Hunk #25 succeeded at 11835 (offset 46 lines).
  Hunk #26 succeeded at 11860 (offset 46 lines).
  Hunk #27 succeeded at 13208 (offset 46 lines).
  Hunk #28 succeeded at 13331 (offset 46 lines).
  Hunk #29 succeeded at 13559 (offset 46 lines).
  Hunk #30 succeeded at 13786 (offset 46 lines).
  Hunk #31 succeeded at 14448 (offset 49 lines).
  Hunk #32 succeeded at 14815 (offset 49 lines).
  Hunk #33 succeeded at 14862 (offset 49 lines).
  1 out of 33 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
226cea1334d286c1b5ba760a7c3ebe93016a939a..8c2579a4123c06c6dc7c7df687aef2425245e79c
100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -2867,11 +2867,11 @@ Psst! Incognito mode <ph
name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
       <if expr="is_android">
         <message name="IDS_PROMPT_DANGEROUS_DOWNLOAD"
                  desc="Mobile: Message shown to the user to validate the
download of a dangerous file.">
-          This type of file can harm your mobile device. Do you want to keep
<ph name="FILE_NAME">$1<ex>malware.exe</ex></ph> anyway?
+          This type of file can harm your device. Do you want to keep <ph
name="FILE_NAME">$1<ex>malware.exe</ex></ph> anyway?
         </message>
         <message name="IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION"
            desc="Mobile: Message shown to the user to validate the download of
an extension file.">
-          Extensions, apps, and themes can harm your mobile device. Are you
sure you want to continue?
+          Extensions, apps, and themes can harm your device. Are you sure you
want to continue?
         </message>
       </if>
       <if expr="not is_android">
@@ -3297,7 +3297,7 @@ Psst! Incognito mode <ph
name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
       </message>
       <if expr="is_android or pp_ifdef('ios')">
         <message name="IDS_CERT_ERROR_EXTRA_INFO_1" desc="Mobile: 1st paragraph
of extra information for any certificate error">
-          When you connect to a secure website, the server hosting that site
presents your browser with something called a "certificate" to verify its
identity. This certificate contains identity information, such as the address of
the website, which is verified by a third party that your mobile device trusts.
By checking that the address in the certificate matches the address of the
website, it is possible to verify that you are securely communicating with the
website you intended, and not a third party (such as an attacker on your
network).
+          When you connect to a secure website, the server hosting that site
presents your browser with something called a "certificate" to verify its
identity. This certificate contains identity information, such as the address of
the website, which is verified by a third party that your device trusts. By
checking that the address in the certificate matches the address of the website,
it is possible to verify that you are securely communicating with the website
you intended, and not a third party (such as an attacker on your network).
         </message>
       </if>
       <if expr="not is_android and not pp_ifdef('ios')">
@@ -3340,12 +3340,12 @@ Psst! Incognito mode <ph
name="SHORTCUT_KEY">$1<ex>(Ctrl+Shift+N)</ex></ph> may
       </message>
       <if expr="is_android or pp_ifdef('ios')">
         <message name="IDS_CERT_ERROR_AUTHORITY_INVALID_EXTRA_INFO_2"
desc="Mobile: 2nd paragraph of extra information for a X509 certificate with an
invalid authority">
-          In this case, the certificate has not been verified by a third party
that your mobile device trusts. Anyone can create a certificate claiming to be
whatever website they choose, which is why it must be verified by a trusted
third party. Without that verification, the identity information in the
certificate is meaningless. It is therefore not possible to verify that you are
communicating with <ph
name="DOMAIN">&lt;strong&gt;$1<ex>paypal.com</ex>&lt;/strong&gt;</ph> instead of
an attacker who generated his own certificate claiming to be <ph
name="DOMAIN2">&lt;strong&gt;$2<ex>paypal.com</ex>&lt;/strong&gt;</ph>. You
should not proceed past this point.
+          In this case, the certificate has not been verified by a third party
that your device trusts. Anyone can create a certificate claiming to be whatever
website they choose, which is why it must be verified by a trusted third party.
Without that verification, the identity information in the certificate is
meaningless. It is therefore not possible to verify that you are communicating
with <ph name="DOMAIN">&lt;strong&gt;$1<ex>paypal.com</ex>&lt;/strong&gt;</ph>
instead of an attacker who generated his own certificate claiming to be <ph
name="DOMAIN2">&lt;strong&gt;$2<ex>paypal.com</ex>&lt;/strong&gt;</ph>. You
should not proceed past this point.
         </message>
       </if>
       <if expr="is_android">
         <message name="IDS_CERT_ERROR_AUTHORITY_INVALID_EXTRA_INFO_3"
desc="Mobile: 3rd paragraph of extra information for a X509 certificate with an
invalid authority">
-          If, however, you work in an organization that generates its own
certificates, and you are trying to connect to an internal website of that
organization using such a certificate, you may be able to solve this problem
securely. You can import your organization's root certificate as a "root
certificate", and then certificates issued or verified by your organization will
be trusted and you will not see this error next time you try to connect to an
internal website. Contact your organization's help staff for assistance in
adding a new root certificate to your mobile device.
+          If, however, you work in an organization that generates its own
certificates, and you are trying to connect to an internal website of that
organization using such a certificate, you may be able to solve this problem
securely. You can import your organization's root certificate as a "root
certificate", and then certificates issued or verified by your organization will
be trusted and you will not see this error next time you try to connect to an
internal website. Contact your organization's help staff for assistance in
adding a new root certificate to your device.
         </message>
       </if>
       <if expr="not is_android and not pp_ifdef('ios')">
@@ -5019,8 +5019,8 @@ Make sure you do not expose any sensitive information.
       </message>
 
       <if expr="is_android">
-        <message name="IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS" desc="Mobile:
Permission string for full access to the mobile device and all websites.">
-          Access all data on your mobile device and the websites you visit
+        <message name="IDS_EXTENSION_PROMPT_WARNING_FULL_ACCESS" desc="Mobile:
Permission string for full access to the device and all websites.">
+          Access all data on your device and the websites you visit
         </message>
       </if>
       <if expr="not is_android">
@@ -6097,16 +6097,11 @@ Keep your key file in a safe place. You will need it to
create new versions of y
           Machine
         </message>
       </if>
-      <if expr="pp_ifdef('chromeos')">
-        <message name="IDS_POLICY_SCOPE_DEVICE" desc="Mobile: Text displayed in
the Applies to column when a policy applies to the entire Chrome OS device.">
+      <if expr="pp_ifdef('chromeos') or is_android">
+        <message name="IDS_POLICY_SCOPE_DEVICE" desc="Mobile: Text displayed in
the Applies To column when a policy applies to everyone on the device.">
           Device
         </message>
       </if>
-      <if expr="is_android">
-        <message name="IDS_POLICY_SCOPE_DEVICE" desc="Mobile: Text displayed in
the Applies To column when a policy applies to everyone on the mobile device.">
-          Mobile device
-        </message>
-      </if>
       <message name="IDS_POLICY_LEVEL_RECOMMENDED" desc="Text displayed in the
Level column when a policy is recommended.">
         Recommended
       </message>
@@ -6221,7 +6216,7 @@ Keep your key file in a safe place. You will need it to
create new versions of y
       </message>
       <if expr="is_android">
         <message name="IDS_FLAGS_CLOUD_PRINT_CONNECTOR_DESCRIPTION"
desc="Mobile: Description of the Cloud Print Connector lab">
-          Enables a background service that connects the Google Cloud Print
service to any printers installed on this mobile device. Once this lab is
enabled, you can turn the Google Cloud Print Connector on by logging in with
your Google account in the Under the Hood section of Settings.
+          Enables a background service that connects the Google …
(message too large)

[commit-bot: I haz the power, 2013-06-04 03:48:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jinsukkim@chromium.org/15980011/10001

[commit-bot: I haz the power, 2013-06-04 12:36:47]

Change committed as 203937