wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 893961. Clean up metro sync strings. r=mbrubeck

Browse Source
This commit is contained in:
Tim Abraldes 2013-08-28 10:27:32 -07:00
parent 31c59e1d70
commit f90885fd5e
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/metro/base/content/browser-ui.js
View File

@ -1304,7 +1304,7 @@ var SettingsCharm = {
});
// Sync
this.addEntry({
label: Strings.browser.GetStringFromName("syncCharm"),
label: Strings.brand.GetStringFromName("syncBrandShortName"),
onselected: function() FlyoutPanelsUI.show('SyncFlyoutPanel')
});
// About

14
browser/metro/base/content/browser.xul
View File

@ -472,21 +472,21 @@
flex="1"
onclick="FlyoutPanelsUI.SyncFlyoutPanel.abortEasySetup();
FlyoutPanelsUI.SyncFlyoutPanel.showManualSetup()">
&sync.flyout.setup.manual.label;
&sync.flyout.setup.manual.label_2;
</description>
<separator />
<description>&sync.flyout.setup.description3;</description>
<description>&sync.flyout.setup.description4;</description>
<description>&sync.flyout.setup.description4_2;</description>
<description class="syncInstructionText">
&sync.flyout.setup.description5;
&sync.flyout.setup.description5_2;
</description>
<description class="syncInstructionText">
&sync.flyout.setup.description6;
&sync.flyout.setup.description6_2;
</description>
</vbox>
<vbox id="sync-manualsetup-container" collapsed="true">
<description>&sync.flyout.manualsetup.description1;</description>
<description>&sync.flyout.manualsetup.description1_2;</description>
<separator/>
<textbox id="sync-manualsetup-account"
placeholder="&sync.flyout.manualsetup.account.placeholder;"
@ -609,9 +609,9 @@
<spacer flex="1" />
</hbox>
<description>&sync.flyout.pairNewDevice.note1;</description>
<description>&sync.flyout.pairNewDevice.note2;</description>
<description>&sync.flyout.pairNewDevice.note2_2;</description>
<description class="syncInstructionText">
&sync.flyout.pairNewDevice.note3;
&sync.flyout.pairNewDevice.note3_2;
</description>
<description class="syncInstructionText">
&sync.flyout.pairNewDevice.note4;

1
browser/metro/locales/en-US/chrome/browser.properties
View File

@ -39,7 +39,6 @@ contextAppbar2.clear=Clear selection
# Settings Charms
aboutCharm1=About
optionsCharm=Options
syncCharm=Sync
helpOnlineCharm=Help (online)
# General

14
browser/metro/locales/en-US/chrome/sync.dtd
View File

@ -13,14 +13,14 @@
<!ENTITY sync.flyout.setup.title "Set Up &syncBrand.shortName.label;">
<!ENTITY sync.flyout.setup.description1 "If you have a &syncBrand.shortName.label; account, select &quot;Pair a Device&quot; on your other device and enter this code.">
<!ENTITY sync.flyout.setup.description2 "If you don&apos;t have a &syncBrand.shortName.label; account, you can create one on your &brandShortName; desktop browser.">
<!ENTITY sync.flyout.setup.manual.label "I&apos;m not near my computer...">
<!ENTITY sync.flyout.setup.manual.label_2 "I&apos;m not near my computer…">
<!ENTITY sync.flyout.setup.description3 "Note:">
<!ENTITY sync.flyout.setup.description4 "You can select &quot;Pair a Device&quot; through">
<!ENTITY sync.flyout.setup.description5 "[Desktop] Preferences -&gt; Sync">
<!ENTITY sync.flyout.setup.description6 "[Android] More &gt; Settings &gt; Sync">
<!ENTITY sync.flyout.setup.description4_2 "To find &quot;Pair a Device&quot;,">
<!ENTITY sync.flyout.setup.description5_2 "[Desktop] Open &quot;Options&quot; or &quot;Preferences&quot; and then select &quot;&syncBrand.shortName.label;&quot;">
<!ENTITY sync.flyout.setup.description6_2 "[Android] More &gt; Settings &gt; &syncBrand.shortName.label;">
<!-- Flyout when setting up manually -->
<!ENTITY sync.flyout.manualsetup.description1 "Please enter your &syncBrand.shortName.label; account information and the Recover Key generated by your computer">
<!ENTITY sync.flyout.manualsetup.description1_2 "Please enter your &syncBrand.shortName.label; account information and the Recovery Key generated by your computer">
<!ENTITY sync.flyout.manualsetup.account.placeholder "Account Name">
<!ENTITY sync.flyout.manualsetup.password.placeholder "Password">
<!ENTITY sync.flyout.manualsetup.recoveryKey.placeholder "Recovery Key">
@ -48,8 +48,8 @@
<!ENTITY sync.flyout.pairNewDevice.description "On the new device you want to pair with, select &quot;Set Up &syncBrand.shortName.label;&quot; and enter the code the device produces">
<!ENTITY sync.flyout.pairNewDevice.pair "Pair">
<!ENTITY sync.flyout.pairNewDevice.note1 "Note:">
<!ENTITY sync.flyout.pairNewDevice.note2 "You can access &syncBrand.shortName.label; to find code through">
<!ENTITY sync.flyout.pairNewDevice.note3 "[Desktop] Tools -&gt; Set Up Sync -&gt; I have an Account">
<!ENTITY sync.flyout.pairNewDevice.note2_2 "To find the code,">
<!ENTITY sync.flyout.pairNewDevice.note3_2 "[Desktop] Open &quot;Options&quot; or &quot;Preferences&quot; and then follow the steps: &syncBrand.shortName.label; -&gt; Set up &syncBrand.shortName.label; -&gt; I have an account">
<!ENTITY sync.flyout.pairNewDevice.note4 "[Android] More &gt; Settings &gt; &syncBrand.shortName.label;">
<!ENTITY sync.flyout.pairNewDevice.failure "Please try again">