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

Side by Side Diff: ios/chrome/app/strings/ios_strings.grd

Issue 2616943002: [Signin iOS] Update order of buttons in dialog for merging data (Closed)
Patch Set: Fix unit tests Created 3 years, 11 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
« no previous file with comments | « no previous file | ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm » ('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 <!-- 3 <!--
4 This file contains definition of resources that will be translated for each 4 This file contains definition of resources that will be translated for each
5 locale. The strings in this file are specific to iOS. 5 locale. The strings in this file are specific to iOS.
6 --> 6 -->
7 7
8 <grit base_dir="." latest_public_release="0" current_release="1" 8 <grit base_dir="." latest_public_release="0" current_release="1"
9 output_all_resource_defines="false" source_lang_id="en" enc_check="möl"> 9 output_all_resource_defines="false" source_lang_id="en" enc_check="möl">
10 <outputs> 10 <outputs>
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 </message> 878 </message>
879 <message name="IDS_IOS_OPTIONS_IMPORT_DATA_KEEP_SUBTITLE_SIGNIN" desc="The subtitle of the Keep Data Separate option on the Import Data settings screen wh en signing in. [400em]"> 879 <message name="IDS_IOS_OPTIONS_IMPORT_DATA_KEEP_SUBTITLE_SIGNIN" desc="The subtitle of the Keep Data Separate option on the Import Data settings screen wh en signing in. [400em]">
880 Delete existing data. 880 Delete existing data.
881 </message> 881 </message>
882 <message name="IDS_IOS_OPTIONS_IMPORT_DATA_KEEP_SUBTITLE_SWITCH" desc="The subtitle of the Keep Data separate option on the Import Data settings screen wh en switching accounts. [400em]"> 882 <message name="IDS_IOS_OPTIONS_IMPORT_DATA_KEEP_SUBTITLE_SWITCH" desc="The subtitle of the Keep Data separate option on the Import Data settings screen wh en switching accounts. [400em]">
883 Delete existing data. You can retrieve it by switching back to <ph name= "USER_EMAIL1">$1<ex>john@doe.com</ex></ph>. 883 Delete existing data. You can retrieve it by switching back to <ph name= "USER_EMAIL1">$1<ex>john@doe.com</ex></ph>.
884 </message> 884 </message>
885 <message name="IDS_IOS_OPTIONS_IMPORT_DATA_KEEP_TITLE" desc="The title of the Keep Data Separate option on the Import Data settings screen. [60em]"> 885 <message name="IDS_IOS_OPTIONS_IMPORT_DATA_KEEP_TITLE" desc="The title of the Keep Data Separate option on the Import Data settings screen. [60em]">
886 Keep my data separate 886 Keep my data separate
887 </message> 887 </message>
888 <message name="IDS_IOS_OPTIONS_IMPORT_DATA_TITLE" desc="The title of the I mport Data settings screen. [30em]">
889 Import Data?
890 </message>
891 <message name="IDS_IOS_OPTIONS_PRELOAD_WEBPAGES" desc="Title for opening t he setting for if/when to preload webpages. [Length: 20em] [iOS only]"> 888 <message name="IDS_IOS_OPTIONS_PRELOAD_WEBPAGES" desc="Title for opening t he setting for if/when to preload webpages. [Length: 20em] [iOS only]">
892 Preload Webpages 889 Preload Webpages
893 </message> 890 </message>
894 <message name="IDS_IOS_OPTIONS_REPORT_AN_ISSUE" desc="Title for the option on Settings page to report an issue. [Length: 20em] [iOS only]"> 891 <message name="IDS_IOS_OPTIONS_REPORT_AN_ISSUE" desc="Title for the option on Settings page to report an issue. [Length: 20em] [iOS only]">
895 Report an Issue 892 Report an Issue
896 </message> 893 </message>
897 <message name="IDS_IOS_OPTIONS_SEARCH_URL_SUGGESTIONS" desc="Title for the option to turn on/off search and URL suggestions. [Length: 18em] [iOS only]"> 894 <message name="IDS_IOS_OPTIONS_SEARCH_URL_SUGGESTIONS" desc="Title for the option to turn on/off search and URL suggestions. [Length: 18em] [iOS only]">
898 Show Suggestions 895 Show Suggestions
899 </message> 896 </message>
900 <message name="IDS_IOS_OPTIONS_SEND_USAGE_DATA" desc="Title for opening th e setting for if/when to send usage data and crash reports. [Length: 20em] [iOS only]"> 897 <message name="IDS_IOS_OPTIONS_SEND_USAGE_DATA" desc="Title for opening th e setting for if/when to send usage data and crash reports. [Length: 20em] [iOS only]">
(...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
1536 </message> 1533 </message>
1537 <message name="IDS_IOS_VOICE_SEARCH_SETTING_TITLE" desc="The title for Voi ce Search setting [Length: 29em] [iOS only]"> 1534 <message name="IDS_IOS_VOICE_SEARCH_SETTING_TITLE" desc="The title for Voi ce Search setting [Length: 29em] [iOS only]">
1538 Voice Search 1535 Voice Search
1539 </message> 1536 </message>
1540 <message name="IDS_IOS_VOICE_SEARCH_SETTING_TTS" desc="The label for setti ng switch enabling text-to-speech response after voice search [Length: 29em] [iO S only]"> 1537 <message name="IDS_IOS_VOICE_SEARCH_SETTING_TTS" desc="The label for setti ng switch enabling text-to-speech response after voice search [Length: 29em] [iO S only]">
1541 Speak Answers Back 1538 Speak Answers Back
1542 </message> 1539 </message>
1543 </messages> 1540 </messages>
1544 </release> 1541 </release>
1545 </grit> 1542 </grit>
OLDNEW
« no previous file with comments | « no previous file | ios/chrome/browser/ui/settings/import_data_collection_view_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698