← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/firefox/gutsy

« back to all changes in this revision

Viewing changes to browser/components/preferences/feeds.xul

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2006-10-10 18:49:32 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010184932-da75izt7y0e59afq
Tags: 1.99+2.0rc2+dfsg-0ubuntu1
* New upstream version 2.0rc2.
* Fix/workaround for epiphany GtkSocket lifetype crash:
  apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
* Change application name to `Firefox', as requested by mdz.
  Files changed:
    - browser/locales/en-US/chrome/branding/brand.dtd
    - browser/locales/en-US/chrome/branding/brand.properties;
  New values:
    - brandShortName and brandFullName: `Bon Echo' => `Firefox'
    - vendorShortName: `Mozilla' => `Ubuntu'
* Make preferences dialogue fit again (bah!).

Show diffs side-by-side

added added

removed removed

Lines of Context:
browser/components/preferences/feeds.xul
44
44
]>
45
45
 
46
46
<overlay id="FeedsPaneOverlay"
47
 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
47
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 
48
         xmlns:aaa="http://www.w3.org/2005/07/aaa">
48
49
 
49
50
  <prefpane id="paneFeeds"
50
51
            onpaneload="gFeedsPane.init();"
72
73
    <script type="application/x-javascript" src="chrome://browser/content/preferences/feeds.js"/>
73
74
 
74
75
    <filefield class="indent" id="selectedAppFilefield" disabled="true" hidden="true"/>
 
76
#ifdef XP_WIN
 
77
    <filefield class="indent" id="defaultSystemReaderFilefield" disabled="true" hidden="true"/>
 
78
#endif
 
79
 
75
80
    <stringbundle id="stringbundle" src="chrome://browser/locale/preferences/feeds.properties"/>
76
81
 
77
82
    <label value="&feedClick.label;"/>
84
89
      <radio value="ask"
85
90
             label="&showPreview.label;"
86
91
             accesskey="&showPreview.accesskey;"/>
87
 
      <radio value="reader"
 
92
      <radio value="reader" id="useReader"
88
93
             label="&subscribeUsing.label;"
89
 
             accesskey="&subscribeUsing.accesskey;"/>
 
94
             accesskey="&subscribeUsing.accesskey;"
 
95
             aaa:labelledby="useReader readers"/>
90
96
      <hbox id="readerContainer" class="indent" flex="1">
91
97
        <listbox id="readers" rows="5" flex="1"
92
 
                 onselect="gFeedsPane.writeSelectedFeedReader();">
 
98
                 aaa:labelledby="useReader"
 
99
                 onselect="gFeedsPane.writeSelectedFeedReader(); event.stopPropagation();">
93
100
          <listcols>
94
101
            <listcol flex="1"/>
95
102
            <listcol/>
100
107
                    image="chrome://browser/skin/page-livemarks.png"/>
101
108
          <listitem id="selectedApplicationListitem" allowevents="true">
102
109
            <listcell id="selectedApplicationCell" class="listcell-iconic"/>
103
 
            <listcell>
 
110
            <listcell id="chooseClientAppCell">
104
111
              <button id="chooseClientApp"
105
112
                      label="&chooseApplication.label;"
106
113
                      accesskey="&chooseApplication.accesskey;"