Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 10167025: Unify ChromeOS/non-ChromeOS strings into one label on sync_ui_util (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « no previous file | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d9d398775d51b738c7061b6ced5a334b41ed6ca8..9ea79576d7993b977bff64fb112c31845db01dd9 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11090,11 +11090,13 @@ Some features may be unavailable. Please check that the profile exists and you
<message name="IDS_SYNC_SERVER_IS_UNREACHABLE" desc="The message to display in the New Tab Page sync section when the server is unreachable.">
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data because it could not connect to the sync server. Retrying...
</message>
- <message name="IDS_SYNC_RELOGIN_LINK_LABEL" desc="The text to display on in the hyperlink when the user needs to sign in again to use sync.">
- Sign in again
- </message>
+ <if expr="not pp_ifdef('chromeos')">
+ <message name="IDS_SYNC_RELOGIN_LINK_LABEL" desc="The text to display on in the hyperlink when the user needs to sign in again to use sync.">
+ Sign in again
+ </message>
+ </if>
<if expr="pp_ifdef('chromeos')">
- <message name="IDS_SYNC_RELOGIN_LINK_LABEL_CHROMEOS" desc="The text to display on in the hyperlink when the user needs to sign in again to use sync.">
+ <message name="IDS_SYNC_RELOGIN_LINK_LABEL" desc="The text to display on in the hyperlink when the user needs to sign out and sign in again to use sync on Chrome OS.">
Sign out then sign in again
</message>
</if>
@@ -11502,55 +11504,67 @@ Some features may be unavailable. Please check that the profile exists and you
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data due to an error signing in.
</message>
<if expr="not pp_ifdef('use_titlecase')">
- <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
- Sign in again...
- </message>
+ <if expr="not pp_ifdef('chromeos')">
altimofeev 2012/04/23 08:19:09 When I was making this change, nested 'if' tags ca
+ <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
+ Sign in again...
+ </message>
+ </if>
+ <if expr="pp_ifdef('chromeos')">
+ <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign out and sign in again to Chrome OS.">
+ Sign out then sign in again...
+ </message>
+ </if>
<message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to update the passphrase.">
Update...
</message>
<message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when sync is not available for their domain.">
OK...
</message>
- <message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign in again.">
- Sync Error: Sign in again...
- </message>
+ <if expr="not pp_ifdef('chromeos')">
+ <message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign in again.">
+ Sync Error: Sign in again...
+ </message>
+ </if>
+ <if expr="pp_ifdef('chromeos')">
+ <message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign out and sign in again to Chrome OS.">
+ Sync Error: Sign out then sign in again...
+ </message>
+ </if>
<message name="IDS_SYNC_PASSPHRASE_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to update the passphrase.">
Sync Error: Update Sync passphrase...
</message>
</if>
- <if expr="not pp_ifdef('use_titlecase') and pp_ifdef('chromeos')">
- <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT_CHROMEOS" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
- Sign out then sign in again...
- </message>
- <message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM_CHROMEOS" desc="The sync error wrench menu item when the user needs to sign in again to CrOS.">
- Sync Error: Sign out then sign in again...
- </message>
- </if>
<if expr="pp_ifdef('use_titlecase')">
- <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
- Sign in Again...
- </message>
+ <if expr="not pp_ifdef('chromeos')">
altimofeev 2012/04/23 08:19:09 same here
+ <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
+ Sign in Again...
+ </message>
+ </if>
+ <if expr="pp_ifdef('chromeos')">
+ <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign out and sign in again on Chrome OS.">
+ Sign out then Sign in Again...
+ </message>
+ </if>
<message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to update the passphrase.">
Update...
</message>
<message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when sync is not available for their domain.">
OK...
</message>
- <message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign in again.">
- Sync Error: Sign in Again...
- </message>
+ <if expr="not pp_ifdef('chromeos')">
+ <message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign in again.">
+ Sync Error: Sign in Again...
+ </message>
+ </if>
+ <if expr="pp_ifdef('chromeos')">
+ <message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign out and sign in again to Chrome OS.">
+ Sync Error: Sign out then Sign in Again...
+ </message>
+ </if>
<message name="IDS_SYNC_PASSPHRASE_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to update the passphrase.">
Sync Error: Update Sync Passphrase...
</message>
</if>
- <if expr="pp_ifdef('use_titlecase') and pp_ifdef('chromeos')">
- <message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT_CHROMEOS" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
- Sign out then Sign in Again...
- </message>
- <message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM_CHROMEOS" desc="The sync error wrench menu item when the user needs to sign in again to CrOS.">
- Sync Error: Sign out then Sign in Again...
- </message>
- </if>
<!-- Sync promo page chrome://signin -->
<message name="IDS_SYNC_PROMO_TAB_TITLE" desc="The title of the sync promo tab.">
« no previous file with comments | « no previous file | chrome/browser/sync/sync_ui_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698