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

Side by Side Diff: chrome/app/generated_resources.grd

Issue 3825005: Fix syncing of sessions. Numerous changes have been made. Currently, the mode... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebased again Created 10 years, 2 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/dom_ui/foreign_session_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- This file contains definitions of resources that will be translated for 3 <!-- This file contains definitions of resources that will be translated for
4 each locale. --> 4 each locale. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/generated_resources.h" type="rc_header"> 9 <output filename="grit/generated_resources.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 8002 matching lines...) Expand 10 before | Expand all | Expand 10 after
8013 </message> 8013 </message>
8014 <message name="IDS_SYNC_DATATYPE_PASSWORDS" desc="Saved passwords, one of the data types that we allow syncing."> 8014 <message name="IDS_SYNC_DATATYPE_PASSWORDS" desc="Saved passwords, one of the data types that we allow syncing.">
8015 Passwords 8015 Passwords
8016 </message> 8016 </message>
8017 <message name="IDS_SYNC_DATATYPE_TYPED_URLS" desc="Typed URLs, one of the data types that we allow syncing."> 8017 <message name="IDS_SYNC_DATATYPE_TYPED_URLS" desc="Typed URLs, one of the data types that we allow syncing.">
8018 Typed URLs 8018 Typed URLs
8019 </message> 8019 </message>
8020 <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types t hat we allow syncing."> 8020 <message name="IDS_SYNC_DATATYPE_APPS" desc="Apps, one of the data types t hat we allow syncing.">
8021 Apps 8021 Apps
8022 </message> 8022 </message>
8023 <message name="IDS_SYNC_DATATYPE_SESSIONS" desc="Sessions, one of the data types that we allow syncing.">
8024 Foreign Sessions
8025 </message>
8023 8026
8024 <!-- Encryption tab of the configure sync dialog --> 8027 <!-- Encryption tab of the configure sync dialog -->
8025 <message name="IDS_SYNC_ENCRYPTION_INSTRUCTIONS" desc="Instructions for th e encryption settings tab."> 8028 <message name="IDS_SYNC_ENCRYPTION_INSTRUCTIONS" desc="Instructions for th e encryption settings tab.">
8026 <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> always encrypts your data when it's tramsmitted to Google. Additionally, passwords are stored encrypted on Google servers. 8029 <ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> always encrypts your data when it's tramsmitted to Google. Additionally, passwords are stored encrypted on Google servers.
8027 </message> 8030 </message>
8028 <message name="IDS_SYNC_ENCRYPT_ALL_LABEL" desc="Label for the checkbox th at enables encryption of everything."> 8031 <message name="IDS_SYNC_ENCRYPT_ALL_LABEL" desc="Label for the checkbox th at enables encryption of everything.">
8029 Encrypt all my data 8032 Encrypt all my data
8030 </message> 8033 </message>
8031 <message name="IDS_SYNC_PASSPHRASE_CHECKBOX_LABEL" desc="Label for the che ckbox that enables a passphrase for sync."> 8034 <message name="IDS_SYNC_PASSPHRASE_CHECKBOX_LABEL" desc="Label for the che ckbox that enables a passphrase for sync.">
8032 Use a sync passphrase to encrypt my data 8035 Use a sync passphrase to encrypt my data
(...skipping 2617 matching lines...) Expand 10 before | Expand all | Expand 10 after
10650 10653
10651 </messages> 10654 </messages>
10652 10655
10653 <structures fallback_to_english="true"> 10656 <structures fallback_to_english="true">
10654 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 10657 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
10655 </structure> 10658 </structure>
10656 </structures> 10659 </structures>
10657 10660
10658 </release> 10661 </release>
10659 </grit> 10662 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/dom_ui/foreign_session_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698