Skip to content

Commit

Permalink
Fix a lot of support links.
Browse files Browse the repository at this point in the history
Things I did:

1) Changed all domains I could find to https://support.google.com
2) Changed all the bin/answer.py?answer=# to answer/#
3) Left any code-populated ?hl= for now (worried about CHECK() failures)

TBR=cpu@chromium.org
BUG=490858,490875,490887

Review URL: https://codereview.chromium.org/1144193005

Cr-Commit-Position: refs/heads/master@{#331064}
  • Loading branch information
danbeam authored and Commit bot committed May 22, 2015
1 parent aa14b71 commit 6262a2f
Show file tree
Hide file tree
Showing 136 changed files with 202 additions and 205 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class ConnectionInfoPopup implements OnClickListener {
private static final String TAG = "ConnectionInfoPopup";

private static final String HELP_URL =
"http://www.google.com/support/chrome/bin/answer.py?answer=95617";
"https://support.google.com/chrome/answer/95617";
private static final int DESCRIPTION_TEXT_SIZE_SP = 12;
private final Context mContext;
private final Dialog mDialog;
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/chromeos_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -2955,7 +2955,7 @@ Press any key to continue exploring.
System installation settings
</message>
<message name="IDS_EULA_TPM_DESCRIPTION" desc="Dialog box text">
Your computer contains a Trusted Platform Module (TPM) security device, which is used to implement many critical security features in Chrome OS. Visit the Chromebook Help Center to learn more: http://support.google.com/chromebook/?p=tpm
Your computer contains a Trusted Platform Module (TPM) security device, which is used to implement many critical security features in Chrome OS. Visit the Chromebook Help Center to learn more: https://support.google.com/chromebook/?p=tpm
</message>
<message name="IDS_EULA_TPM_KEY_DESCRIPTION" desc="Dialog box text">
Below is the randomly generated TPM password that has been assigned to your computer:
Expand Down
6 changes: 3 additions & 3 deletions chrome/app/generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -4411,13 +4411,13 @@ Even if you have downloaded files from this website before, the website might ha
<message name="IDS_EXTENSION_ALERT_ITEM_EXTERNAL" desc="A statement that an external extension has been newly installed. End users have no idea what an 'external' extension is, so we simply call them extensions.">
The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" has been added.
</message>
<message name="IDS_EXTENSION_ALERT_ITEM_BLACKLISTED" desc="A statement that an extension has been newly blacklisted. http://www.google.com/support/chrome/bin/answer.py?hl=en&amp;answer=1210215 contains the language on which we're basing the phrasing.">
<message name="IDS_EXTENSION_ALERT_ITEM_BLACKLISTED" desc="A statement that an extension has been newly blacklisted. https://support.google.com/chrome/answer/1210215 contains the language on which we're basing the phrasing.">
The extension "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>" was automatically removed.
</message>
<message name="IDS_APP_ALERT_ITEM_EXTERNAL" desc="A statement that an external packaged app has been newly installed. End users have no idea what an 'external' app is, so we simply call them apps.">
The app "<ph name="EXTENSION_NAME">$1<ex>Gmail</ex></ph>" has been added.
</message>
<message name="IDS_APP_ALERT_ITEM_BLACKLISTED" desc="A statement that a packaged app has been newly blacklisted. http://www.google.com/support/chrome/bin/answer.py?hl=en&amp;answer=1210215 contains the language on which we're basing the phrasing.">
<message name="IDS_APP_ALERT_ITEM_BLACKLISTED" desc="A statement that a packaged app has been newly blacklisted. https://support.google.com/chrome/answer/1210215 contains the language on which we're basing the phrasing.">
The app "<ph name="EXTENSION_NAME">$1<ex>Gmail</ex></ph>" was automatically removed.
</message>
<message name="IDS_EXTENSION_ALERT_ITEM_OK" desc="The title of the default button acknowledging the information presented.">
Expand Down Expand Up @@ -14809,7 +14809,7 @@ After you create a new supervised user, you can manage their settings at any tim
</message>
</if>
<message name="IDS_APP_LIST_SIGNIN_LEARN_MORE_LINK" desc="App launcher sign-in learn more URL.">
https://support.google.com/chrome/bin/answer.py?hl=[GRITLANGCODE]&amp;answer=165139&amp;p=settings_sign_in
https://support.google.com/chrome/?hl=[GRITLANGCODE]&amp;p=settings_sign_in
</message>
<message name="IDS_APP_LIST_SIGNIN_SETTINGS_TEXT" desc="App launcher sign-in settings link text.">
App Launcher Settings
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/google_chrome_strings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ Google Chrome is unable to recover your settings.
</if>
<!-- chrome://crashes strings -->
<message name="IDS_CRASHES_DISABLED_MESSAGE" desc="The explanatory message for chrome://crashes when crash reporting is disabled">
This page only shows information on your recent crashes if you <ph name="BEGIN_LINK">&lt;a href="https://www.google.com/support/chrome/bin/answer.py?answer=96817"&gt;</ph>enable crash reporting<ph name="END_LINK">&lt;/a&gt;</ph>.
This page only shows information on your recent crashes if you <ph name="BEGIN_LINK">&lt;a href="https://support.google.com/chrome/answer/96817"&gt;</ph>enable crash reporting<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
<!-- Page Info bubble -->
<message name="IDS_PAGE_INFO_INTERNAL_PAGE" desc="Message to display in the page info bubble when the page you are on is a chrome:// page or about:something.">
Expand Down
4 changes: 2 additions & 2 deletions chrome/app/resources/locale_settings.grd
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
</message>

<message name="IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL" translateable="false">
https://www.google.com/support/chrome/bin/answer.py?answer=1181420
https://support.google.com/chrome/answer/1181420
</message>

<!-- The width for the "create application shortcuts" dialog in characters. -->
Expand Down Expand Up @@ -419,7 +419,7 @@
</message>

<message name="IDS_FACTORY_RESET_HELP_URL" translateable="false">
http://support.google.com/chromeos/bin/answer.py?answer=183084&amp;hl=[GRITLANGCODE]
https://support.google.com/chromebook/answer/183084?hl=[GRITLANGCODE]
</message>
</if>
</messages>
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/resources/manpage.1.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
.SH DESCRIPTION
See the Google Chrome help center for help on using the browser.
.IP
<http://www.google.com/support/chrome/>
<https://support.google.com/chrome/>
.PP
This manpage only describes invocation, environment, and arguments.

Expand Down
2 changes: 1 addition & 1 deletion chrome/app/resources/terms/chromeos/terms_en.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h2>Chrome OS Terms</h2>
<p><strong>9. Content in the Services</strong></p>
<p>9.1 You understand that all information (such as data files, written text, computer software, music, audio files or other sounds, photographs, videos or other images) which you may have access to as part of, or through your use of, the Services are the sole responsibility of the person from which such content originated. All such information is referred to below as the “Content.”</p>
<p>9.2 You should be aware that Content presented to you as part of the Services, including but not limited to advertisements in the Services and sponsored Content within the Services may be protected by intellectual property rights which are owned by the sponsors or advertisers who provide that Content to Google (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this Content (either in whole or in part) unless you have been specifically told that you may do so by Google or by the owners of that Content, in a separate agreement.</p>
<p>9.3 Google reserves the right (but shall have no obligation) to pre-screen, review, flag, filter, modify, refuse or remove any or all Content from any Service. For some of the Services, Google may provide tools to filter out explicit sexual content. These tools include the SafeSearch preference settings (see http://www.google.com/help/customize.html#safe). In addition, there are commercially available services and software to limit access to material that you may find objectionable.</p>
<p>9.3 Google reserves the right (but shall have no obligation) to pre-screen, review, flag, filter, modify, refuse or remove any or all Content from any Service. For some of the Services, Google may provide tools to filter out explicit sexual content. These tools include the SafeSearch preference settings (see https://support.google.com/websearch/answer/510). In addition, there are commercially available services and software to limit access to material that you may find objectionable.</p>
<p>9.4 You understand that by using the Services you may be exposed to Content that you may find offensive, indecent or objectionable and that, in this respect, you use the Services at your own risk.</p>
<p>9.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any Content that you create, transmit or display while using the Services and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. You retain copyright and any other rights you already hold in Content which you submit, post or display on or through, the Services.</p>
<p><strong>10. Proprietary rights</strong></p>
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/resources/terms/terms_am.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2>የGoogle Chrome የአግልግሎት ስምምነት ውሎች </h2>
<p><strong>7. በአገልግሎቶቹ ውስጥ ያሉ ይዘቶች</strong></p>
<p>7.1 አገልግሎቶቹን በመጠቀመዎ ምክንያት ያገኟቸው መረጃዎች (እንደ ውሂብ ፋይሎች፣ የተጻፈ ጽሁፍ፣ የኮምፒውተር ሶፍትዌር፣ ሙዚቃ፣ የድምፅ ፋይሎች ወይም ሌላ ድምፆች፣ ፎቶዎች፣ ቪዲዮዎች ወይም ምስሎች) እነዚህ ይዘቶች ከመጡበት የመጀመሪያ ቦታ ያለው ሰው ላይ ሙሉ ኃላፊነት እንዳለ ተረድተዋል። እንደነዚህ ያሉ መረጃዎች ከታች እንደ “ይዘት” በሚል ተጠቅሰዋል። </p>
<p>7.2 አንድ የአገልግሎቶቹ ክፍል ሆኖ ለርስዎ የቀረበ ይዘት በአገልግሎቶቹ ውስጥ ያለ ነገር ግን በአገልግሎቶቹ ውስጥ ላሉ ማስታወቂያዎች እና የተደገፈ ይዘት ብቻ ያልተወሰነ፣ ይህን የዘት ለGoogle ባቀረቡ ደጋፊዎች ወይም አስታዋቂዎች (ወይም እነርሱን ለሚወክሉ ሌሎች ሰዎች ወይም ኩባንያዎች) አእምሮአዋዊ ባለቤትነት የተጠበቀ መሆኑን ማወቅ አለብዎ። በGoogle ወይም በዛ ይዘት ባለቤቶች በተለየ ስምምነት ይህን እንዲያደርጉ በግል ካልተነገርዎ በስተቀር፣ ይህን ይዘት (በሙሉም ሆነ በከፊል) ማሻሻል፣ ማከራየት፣ በሊዝ መሸጥ፣ ማዋስ፣ መሸጥ፣ ማሰራጨት ወይም አውጣቶ/ወስዶ ስራዎችን መፍጠር አይችሉም።</p>
<p>7.3 Google የማንኛውም አገልግሎትን ማንኛውም ወይም ሁሉንም ይዘት የቅድመ-ማጣራት፣ የመከለስ፣ የመለየት፣ የማጣራት፣ የማሻሻል፣ የመከልከል ወይም የማስወገድ መብትን (ያለምንም ግዴታ) ይጠብቃል። ለአንዳንድ አገልግሎቶች፣ Google ግልጽ የሆኑ የግብረ ስጋ ግንኙነት ይዘቶች ያላቸውን ለይቶ ለማውጣት መሳሪያዎችን ሊያቀርብ ይችላል። እነዚህ መሳሪያዎች የአስተማማኝ ፍለጋ/ሴፍሰርች አማራጭ ቅንጅቶችን ያካትታሉ (http://www.google.com/help/customize.html#safe ይመልከቱ)። ከዚህም በተጨማሪ በገበያ ላይ የሚገኙ የሚቃወሙዋቸውን ቁሳቁሶች ሊገድቡ የሚችሉ አገልግሎቶችና ሶፍትዌር አሉ።</p>
<p>7.3 Google የማንኛውም አገልግሎትን ማንኛውም ወይም ሁሉንም ይዘት የቅድመ-ማጣራት፣ የመከለስ፣ የመለየት፣ የማጣራት፣ የማሻሻል፣ የመከልከል ወይም የማስወገድ መብትን (ያለምንም ግዴታ) ይጠብቃል። ለአንዳንድ አገልግሎቶች፣ Google ግልጽ የሆኑ የግብረ ስጋ ግንኙነት ይዘቶች ያላቸውን ለይቶ ለማውጣት መሳሪያዎችን ሊያቀርብ ይችላል። እነዚህ መሳሪያዎች የአስተማማኝ ፍለጋ/ሴፍሰርች አማራጭ ቅንጅቶችን ያካትታሉ (https://support.google.com/websearch/answer/510 ይመልከቱ)። ከዚህም በተጨማሪ በገበያ ላይ የሚገኙ የሚቃወሙዋቸውን ቁሳቁሶች ሊገድቡ የሚችሉ አገልግሎቶችና ሶፍትዌር አሉ።</p>
<p>7.4 አገልግሎቶቹን በመጠቀምዎ ደስ የማይል፣ ነውረኛ ወይም የሚቃወሙት ይዘት ሊያጋጥምዎት ይችላል፣ በእንደዚህ ያለ ሁኔታ አገልግሎቶቹን የሚጠቀሙት በራስዎ ኃላፊነት መሆኑን ተርድተዋል።</p>
<p>7.5 አገልግሎቶቹን ሲጠቀሙ ለሚፈጥሩት፣ ለሚያስተላልፉት ወይም እንዲታይ ለሚያደርጉት ማንኛውንም ይዘትና በዚህም በሚወሰዱ እርምጃዎች ለሚከሰቱት ነገሮች (Google ሊደርሱበት የሚችሉ ማንኛውም ጥፋቶችን ወይም ጉዳቶችን ጨምሮ) ለብቻዎ ኃላፊነቱን ለመውሰድ ተስማምተዋል። (እንዲሁም Google ለርስዎ ወይም ለማንኛውም ሶስተኛ ወገን ኃላፊነት አይወስድም)።</p>
<p><strong>8. የንብረት ባለቤትነት መብቶች </strong></p>
Expand Down
2 changes: 1 addition & 1 deletion chrome/app/resources/terms/terms_ar.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h2>بنود خدمة Google Chrome</h2>
<p><strong>7. المحتويات التي تشتمل عليها الخدمات</strong></p>
<p>7-1 إنك تدرك أن جميع المعلومات (مثل ملفات البيانات أو النصوص المكتوبة أو برامج الكمبيوتر أو الموسيقى أو الملفات الصوتية أو غير ذلك من محتويات الصوت أو الصور الفوتوغرافية أو الفيديو أو غير ذلك من المواد المصورة) التي يمكنك الوصول إليها كجزء من استخدامك للخدمات أو من خلال استخدامك لها هي مسؤولية الشخص الذي أنشأ هذه المحتويات وحده. ويشار إلى كل هذه المعلومات في ما يلي باسم "المحتويات".</p>
<p>7-2 يجب إدراك أن المحتويات المقدَّمة إليك كجزء من الخدمات، بما في ذلك، على سبيل المثال لا الحصر الإعلانات المنشورة عبر الخدمات والمحتويات الواقعة تحت رعاية جهة ما ضمن الخدمات، قد تكون محمية بقوانين حقوق الملكية الفكرية التي يملكها المعلنون أو الجهات الراعية التي توفر هذه المحتويات لشركة Google (أو يملكها أشخاص آخرون أو شركات أخرى نيابةً عن هذه الجهات)؛ لذا لا يجوز لك تعديل هذه المحتويات أو تأجيرها أو استئجارها أو إقراضها أو بيعها أو توزيعها أو إنشاء أعمال اشتقاقية منها (سواء أكان بشكل كلي أم جزئي) ما لم تخطرك Google أو مالكو هذه المحتويات بصفة خاصة بجواز عمل ذلك بموجب اتفاقية مستقلة.</p>
<p>7-3 تحتفظ Google لنفسها بالحق (ولكنها غير مُلزَمة) بإجراء عرض مسبق أو مراجعة أو وضع علامة على أو تصفية أو تعديل أو رفض أو إزالة أي جزء من المحتويات أو كلها من أية خدمة. وقد توفر Google في بعض الخدمات أدوات لتصفية واستبعاد المحتويات الجنسية الصريحة. وتتضمن هذه الأدوات إعدادات تفضيلات البحث الآمن (راجع http://www.google.ae/help/customize.html#safe). بالإضافة إلى ذلك، هناك خدمات وبرامج متوفرة تجاريًا لتقييد الوصول إلى المواد التي قد تعتبرها مرفوضة.</p>
<p>7-3 تحتفظ Google لنفسها بالحق (ولكنها غير مُلزَمة) بإجراء عرض مسبق أو مراجعة أو وضع علامة على أو تصفية أو تعديل أو رفض أو إزالة أي جزء من المحتويات أو كلها من أية خدمة. وقد توفر Google في بعض الخدمات أدوات لتصفية واستبعاد المحتويات الجنسية الصريحة. وتتضمن هذه الأدوات إعدادات تفضيلات البحث الآمن (راجع https://support.google.com/websearch/answer/510). بالإضافة إلى ذلك، هناك خدمات وبرامج متوفرة تجاريًا لتقييد الوصول إلى المواد التي قد تعتبرها مرفوضة.</p>
<p>7-4 إنك تدرك أنه باستخدامك للخدمات قد تتعرض لمحتويات ربما تجدها عدائية أو غير لائقة أو مرفوضة، وأنه في هذه الحالة فإن استخدامك للخدمات يكون على مسؤوليتك الشخصية.</p>
<p>7-5 إنك توافق على أنك المسؤول الوحيد (وأن Google لا تتحمل أية مسؤولية تجاهك أو تجاه أي طرف ثالث) عن أية محتويات تنشئها أنت أو ترسلها أو تعرضها أثناء استخدام الخدمات، وعن العواقب الناجمة عن أفعالك (بما في ذلك أية خسائر أو أضرار قد تتعرض لها Google) عند قيامك بذلك.</p>
<p><strong>8. حقوق الملكية</strong></p>
Expand Down
Loading

0 comments on commit 6262a2f

Please sign in to comment.