| Index: chrome/app/generated_resources.grd
|
| ===================================================================
|
| --- chrome/app/generated_resources.grd (revision 67523)
|
| +++ chrome/app/generated_resources.grd (working copy)
|
| @@ -4219,9 +4219,6 @@
|
| <message name="IDS_CONFLICTS_CHECK_WARNING_PREFIX" desc="Warning label prefix on the compatibility page">
|
| Warning:
|
| </message>
|
| - <message name="IDS_CONFLICTS_CHECK_VERSION_STRING" desc="The version string to show on the compatibility page">
|
| - Version <ph name="VERSION">$1<ex>1.2.3.4</ex></ph>.
|
| - </message>
|
| <message name="IDS_CONFLICTS_CHECK_INVESTIGATING" desc="A label on the compatibility page saying we are investigating.">
|
| We are currently investigating this issue.
|
| </message>
|
| @@ -4258,6 +4255,9 @@
|
| <message name="IDS_CONFLICTS_HEADER_HELP_TIP" desc="The 'Help tip:' header for each module item in the list">
|
| Help tip:
|
| </message>
|
| + <message name="IDS_CONFLICTS_NOT_LOADED_YET" desc="Shown next to a module that has not been loaded into memory yet">
|
| + Not loaded yet
|
| + </message>
|
| <message name="IDS_HELP_CENTER_VIEW_CONFLICTS" desc="The url of the Help center article for the View Conflicts page">
|
| http://www.google.com/support/chrome/bin/answer.py?answer=666386&hl=[GRITLANGCODE]&n=<ph name="NAME">$1<ex>Hash</ex></ph>&l=<ph name="LOCATION">$2<ex>Hash</ex></ph>&d=<ph name="DESC">$3<ex>Hash</ex></ph>&s=<ph name="SIGNER">$4<ex>Hash</ex></ph>
|
| </message>
|
|
|