Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merge pull request #30 from mozilla-services/string-changes

New strings per design review. r=rnewman
  • Loading branch information...
rnewman committed Jan 18, 2012
2 parents 125c280 + da399b1 commit 6de0b27fb71c006100600488ea64b81859cfb9b4
Showing with 10 additions and 5 deletions.
  1. +2 −2 res/layout/sync_setup.xml
  2. +4 −3 strings.xml.in
  3. +4 −0 sync_strings.dtd.in
@@ -23,7 +23,7 @@
style="@style/SyncTextItem"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="@string/sync_subtitle_pair" />
android:text="@string/sync_subtitle_connect" />

<TextView
style="@style/SyncLinkItem"
@@ -45,7 +45,7 @@
android:id="@+id/link_nodevice"
style="@style/SyncLinkItem"
android:onClick="manualClickHandler"
android:text="@string/sync_link_nodevice" />
android:text="@string/sync_link_advancedsetup" />

<LinearLayout
android:layout_width="wrap_content"
@@ -1,13 +1,14 @@
<string name="sync_app_name">&sync.app.name.label;</string>
<string name="sync_title_connect">&sync.title.connect.label;</string>
<string name="sync_title_connect">&sync.title.adddevice.label;</string>
<string name="sync_title_pair">&sync.title.pair.label;</string>

<!-- J-PAKE PIN Screen -->
<string name="sync_subtitle_connect">&sync.subtitle.connect.label;</string>
<string name="sync_subtitle_header">&sync.subtitle.header.label;</string>
<string name="sync_subtitle_connect">&sync.subtitle.connectlocation.label;</string>
<string name="sync_subtitle_pair">&sync.subtitle.pair.label;</string>
<string name="sync_pin_default">&sync.pin.default.label;</string>
<string name="sync_link_show">&sync.link.show.label;</string>
<string name="sync_link_nodevice">&sync.link.nodevice.label;</string>
<string name="sync_link_advancedsetup">&sync.link.advancedsetup.label;</string>

<!-- J-PAKE Waiting Screen -->

@@ -6,13 +6,17 @@
<!-- Main titles. -->
<!ENTITY sync.app.name.label '&syncBrand.fullName.label;'>
<!ENTITY sync.title.connect.label 'Connect to &syncBrand.shortName.label;'>
<!ENTITY sync.title.adddevice.label 'Add a &syncBrand.fullName.label; Account'>
<!ENTITY sync.title.pair.label 'Pair a Device'>

<!-- J-PAKE Key Screen -->
<!ENTITY sync.subtitle.connect.label 'To activate your new device, select “Set up &syncBrand.shortName.label;” on the device.'>
<!ENTITY sync.subtitle.header.label 'Enter this code on your desktop'>
<!ENTITY sync.subtitle.connectlocation.label 'Select “&sync.title.pair.label;” in the &syncBrand.shortName.label; section of your desktop Firefox options.'>
<!ENTITY sync.subtitle.pair.label 'To activate, select “Pair a device” on your other device.'>
<!ENTITY sync.pin.default.label '...\n...\n...\n'>
<!ENTITY sync.link.show.label 'Show me how.'>
<!ENTITY sync.link.advancedsetup.label 'Advanced setup...'>
<!ENTITY sync.link.nodevice.label 'I don\&apos;t have the device with me…'>

<!-- J-PAKE Waiting Screen -->

0 comments on commit 6de0b27

Please sign in to comment.
You can’t perform that action at this time.