Remove obsolete/unused entities in suite string files

RESOLVED FIXED

Status

SeaMonkey
General
RESOLVED FIXED
9 years ago
6 years ago

People

(Reporter: wladow, Assigned: wladow)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(9 attachments, 2 obsolete attachments)

10.80 KB, patch
neil@parkwaycc.co.uk
: review+
neil@parkwaycc.co.uk
: superreview+
Details | Diff | Splinter Review
25.46 KB, patch
neil@parkwaycc.co.uk
: review+
neil@parkwaycc.co.uk
: superreview+
Details | Diff | Splinter Review
3.54 KB, patch
neil@parkwaycc.co.uk
: review+
neil@parkwaycc.co.uk
: superreview+
Details | Diff | Splinter Review
2.92 KB, patch
neil@parkwaycc.co.uk
: review+
neil@parkwaycc.co.uk
: superreview+
Details | Diff | Splinter Review
28.20 KB, patch
Details | Diff | Splinter Review
41.89 KB, patch
neil@parkwaycc.co.uk
: review+
neil@parkwaycc.co.uk
: superreview+
Details | Diff | Splinter Review
41.34 KB, patch
Details | Diff | Splinter Review
13.01 KB, patch
neil@parkwaycc.co.uk
: review+
neil@parkwaycc.co.uk
: superreview+
Details | Diff | Splinter Review
623 bytes, patch
neil@parkwaycc.co.uk
: review+
neil@parkwaycc.co.uk
: superreview+
Details | Diff | Splinter Review
With the help of 'obsolete strings finder' script used i.a. in bug 461112 and bug 463869 we can remove hundreds of unused strings from /suite to make localizer lifes easier.

I'll attach separate patches for each module for easier review and readability.
Created attachment 347137 [details] [diff] [review]
browser part v1 (checked in)

navigator.properties:
intl.* values seem to loaded from toolkit now

region.properties:
not 100% sure about these, but mxr says they are not used
Assignee: nobody → wladow
Attachment #347137 - Flags: superreview?(neil)
Attachment #347137 - Flags: review?(neil)

Comment 2

9 years ago
Comment on attachment 347137 [details] [diff] [review]
browser part v1 (checked in)

Since I'm verifying that these are obsolete, I thought I might as well comment on why they have become obsolete where possible.

>-  <menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help"/>
The checkin that made these obsolete blames bug 64313?

>-<!ENTITY nothingAvailable.label "(Nothing Available)">
This got moved to navigator.properties in bug 53922.

>-<!ENTITY browserCmd.label	"New Browser Window">
>-<!ENTITY browserCmd.accesskey	"N">
This was used by the old P3P dialog.

>-<!ENTITY editFrameCmd.label "Edit Frame">
>-<!ENTITY editFrameCmd.accesskey "m">
>-<!ENTITY editFrameSetCmd.label "Edit Frameset">
>-<!ENTITY editFrameSetCmd.accesskey "t">
Presumably intended to be part of the File menu, although Composer never did get to support frames...

>-<!ENTITY translate.commandKey "t">
Possibly intended to be a shortcut key for Tools/Translate?

>-<!-- I'd like all this to move to an overlay or something -->
>-<!ENTITY bidiMenu.label "Bidi Options">
>-<!ENTITY directionBidiMenu.label "Default Direction">
>-<!ENTITY directionRTLBidiCmd.label "Right to Left">
>-<!ENTITY directionLTRBidiCmd.label "Left to Right">
>-<!ENTITY texttypeBidiMenu.label "Text Type">
>-<!ENTITY charsettexttypeBidiCmd.label "Based on Character Set">
>-<!ENTITY logicaltexttypeBidiCmd.label "Logical">
>-<!ENTITY visualtexttypeBidiCmd.label "Visual">
>-<!ENTITY numeralBidiMenu.label "Numeral Shape">
>-<!ENTITY regularcontextnumeralBidiCmd.label "Contextual">
>-<!ENTITY hindicontextnumeralBidiCmd.label "Hindi Numerals on RTL Document Direction">
>-<!ENTITY arabicnumeralBidiCmd.label "Arabic">
>-<!ENTITY hindinumeralBidiCmd.label "Hindi">
>-<!ENTITY controlstextmodeBidiMenu.label "Text Mode in Controls">
>-<!ENTITY logicalcontrolstextmodeBidiCmd.label "Logical">
>-<!ENTITY visiualcontrolstextmodeBidiCmd.label "Visual">
>-<!ENTITY containercontrolstextmodeBidiCmd.label "Like Containing Document">
>-<!ENTITY charactersetBidiMenu.label "Character set">
>-<!ENTITY doccharactersetBidiCmd.label "Use the document specified character set">
>-<!ENTITY defaultcharactersetBidiCmd.label "Use my default character set, overriding the document-specified character set">
Added without any consumers in bug 79680?!

>-<!ENTITY webContentMenu.label "Languages and Web Content">
>-<!ENTITY webContentMenu.accesskey "l">
>-<!ENTITY downloadMore.label "Download More">
>-<!ENTITY downloadMore.accesskey "D">
Presumably obsoleted when the (now itself obsolete) Languages pref pane was created.

>-<!ENTITY searchMenu.label "Search">
>-<!ENTITY searchMenu.accesskey "S">
Presumably obsoleted by bug 25412.

>-<!ENTITY helpMenuCmd.label "Help">
>-<!ENTITY helpMenuCmd.accesskey "h">
The checkin that made these obsolete blames bug 64313?

>-<!ENTITY helpContentsCmd.label "Help Contents">
>-<!ENTITY softwareUpdatesCmd.label "Software Updates">
>-<!ENTITY technicalSupportCmd.label "Technical Support">
>-<!ENTITY releaseNotesCmd.label "Release Notes">
This predates me, but it's possible they were used by Netscape.

>-<!ENTITY internetKeyword.tooltip      "Return to previously viewed page or choose keyword">
Looks like a Ben Goodger special.

>-# all.js
>-#
>-# Localization Note: font.language.group controls the initial setting of the
>-# language drop-down in the fonts pref panel. Set it to the value of one of the
>-# menuitems in the "selectLangs" menulist in
>-# /xpfe/components/prefwindow/resources/content/pref-fonts.xul 
>-font.language.group=x-western
>-# Localization Note: Add the code for your language at the front of this entry,
>-# leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
>-# "ja-jp, ja, en-us, en"
>-intl.accept_languages=en-us, en
>-intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
>-intl.charsetmenu.browser.more1=ISO-8859-1, ISO-8859-15, IBM850, x-mac-roman, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3
>-intl.charsetmenu.browser.more2=ISO-8859-4, ISO-8859-13, windows-1257, IBM852, ISO-8859-2, x-mac-ce, windows-1250, x-mac-croatian, IBM855, ISO-8859-5, ISO-IR-111, KOI8-R, x-mac-cyrillic, windows-1251, IBM866, KOI8-U, x-mac-ukrainian, ISO-8859-16, x-mac-romanian
>-intl.charsetmenu.browser.more3=GB2312, x-gbk, gb18030, HZ-GB-2312, ISO-2022-CN, Big5, Big5-HKSCS, x-euc-tw, EUC-JP, ISO-2022-JP, Shift_JIS, EUC-KR, x-windows-949, x-johab, ISO-2022-KR
>-intl.charsetmenu.browser.more4=armscii-8, GEOSTD8, TIS-620, ISO-8859-11, windows-874, IBM857, ISO-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, VISCII, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi
>-intl.charsetmenu.browser.more5=ISO-8859-6, windows-1256, IBM864, x-mac-arabic, x-mac-farsi, ISO-8859-8-I, windows-1255, ISO-8859-8, IBM862, x-mac-hebrew
>-# Localization Note: Do NOT change this entry.
>-intl.charsetmenu.browser.unicode=UTF-8, UTF-16, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE, UTF-7
>-intl.charset.default=ISO-8859-1
>-intl.charset.detector=
>-intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
>-# valid intl.menuitems.appendedacceskeys are: true or false, <empty string> (missing or empty preference equals false)
>-intl.menuitems.alwaysappendaccesskeys=
>-# valid intl.menuitems.insertseparatorbeforeaccesskeys are: true or false, <empty string> (missing or empty preference equals false)
>-intl.menuitems.insertseparatorbeforeaccesskeys=true
These were always mirrored in global.properties but truly got obsoleted in bug 297759.

>-linkTargetLabel=Link will open in:
>-linkHREFLabel=Location:
Another Ben Goodger special.

>-#navigator.js
>-oldthemetitle=Warning: incompatible theme
>-oldTheme=You have selected a theme which was designed for an earlier version of %brand% and is incompatible with your current %brand% version. Please check %brand% theme sites for an updated version of the theme. You can uninstall this theme by clicking \"OK\" button.
Used by the old View - Apply Theme switcher.

>-noPopupControl=can't control popups for this site
Used by an earlier revision of the patch for bug 166442. Not sure how it managed to get checked in.

>-showskinsdescription=true
Used by the old Themes preference panel.

>-<!ENTITY  formNo                "No.">
Accidentally landed as part of bug 52730 although it was only used in earlier revisions of the patch.

>-homePageDefault=http://www.mozilla.org/
>-keywordList=http://home.netscape.com/escapes/keywords
>-webmailKeyword=http://webmail.netscape.com
These were actually obsoleted by bug 337339 and bug 264830 but for some reason they were not removed along with other entries that did get removed.

>-general.useragent.contentlocale=US
This was used for language switching under XPFE, which had separate region and content packs.

>-browsewithcaret.checkMsg=Do not show me this dialog box again.
>-browsewithcaret.checkWindowTitle=Caret Browsing
>-browsewithcaret.checkLabel=Pressing F7 turns Caret Browsing on or off. This feature places a moveable cursor in web pages, allowing you to select text with the keyboard. Do you want to turn Caret Browsing on?
These got moved from tabbrowser by bug 393351 (but it only patched toolkit).
Attachment #347137 - Flags: superreview?(neil)
Attachment #347137 - Flags: superreview+
Attachment #347137 - Flags: review?(neil)
Attachment #347137 - Flags: review+

Updated

9 years ago
Attachment #347137 - Attachment description: browser part v1 → browser part v1 (checked in)

Comment 3

9 years ago
Comment on attachment 347137 [details] [diff] [review]
browser part v1 (checked in)

Per IRC talk with wladow, I pushed this as http://hg.mozilla.org/comm-central/rev/b0e600e96c4b
Created attachment 347157 [details] [diff] [review]
common part,dtds,v1

contains:
- polish bookmarks manager entities and remove unused
- move accesskeys for menu_deleteByDomain and menu_deleteByDomain items from .dtd to .properties
- use unused accesskeys in search-editor
- other changes are just removals
Attachment #347157 - Flags: superreview?(neil)
Attachment #347157 - Flags: review?(neil)
And I forgot to mention: do we need bookmarksOverlay.dtd file? http://mxr.mozilla.org/comm-central/source/suite/locales/en-US/chrome/common/bookmarks/bookmarksOverlay.dtd

I think we could remove it completely.
Created attachment 347165 [details] [diff] [review]
common part,properties,v1
Attachment #347165 - Flags: superreview?(neil)
Attachment #347165 - Flags: review?(neil)

Comment 7

9 years ago
(In reply to comment #5)
>And I forgot to mention: do we need bookmarksOverlay.dtd file?
>http://mxr.mozilla.org/comm-central/source/suite/locales/en-US/chrome/common/bookmarks/bookmarksOverlay.dtd
>I think we could remove it completely.
Looks unused to me too. Don't forget to fix up bookmarksOverlay.xul's DOCTYPE.
Created attachment 347175 [details] [diff] [review]
remove bookmarksOverlay.dtd
Attachment #347175 - Flags: superreview?(neil)
Attachment #347175 - Flags: review?(neil)

Updated

9 years ago
Attachment #347157 - Flags: superreview?(neil)
Attachment #347157 - Flags: superreview+
Attachment #347157 - Flags: review?(neil)
Attachment #347157 - Flags: review+

Comment 9

9 years ago
Comment on attachment 347157 [details] [diff] [review]
common part,dtds,v1

warning: 4 lines add whitespace errors (although 2 lines took away old whitespace errors).

Please don't change the history window as we will be rewriting it anyway when we convert to places history backend.
Comment on attachment 347175 [details] [diff] [review]
remove bookmarksOverlay.dtd

> <!DOCTYPE overlay [
>-<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd" >
>-%utilDTD;
> <!ENTITY % bmDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
> %bmDTD;
> ]>
Don't we use a different format when there's only one DTD?
Created attachment 347177 [details] [diff] [review]
remove bookmarksOverlay.dtd v2

Sorry. Like this?
Attachment #347175 - Attachment is obsolete: true
Attachment #347177 - Flags: superreview?(neil)
Attachment #347177 - Flags: review?(neil)
Attachment #347175 - Flags: superreview?(neil)
Attachment #347175 - Flags: review?(neil)
Comment on attachment 347165 [details] [diff] [review]
common part,properties,v1

>diff --git a/suite/locales/en-US/chrome/common/search/search-panel.properties b/suite/locales/en-US/chrome/common/search/search-panel.properties
>--- a/suite/locales/en-US/chrome/common/search/search-panel.properties
>+++ b/suite/locales/en-US/chrome/common/search/search-panel.properties
>@@ -1,8 +1,6 @@
> enterstringandlocation=Enter some text to search for and select at least one location to search.
> enableAdvanced=Enable advanced search options
> disableAdvanced=Disable advanced search options
>-addtobookmarks=Add to bookmarks
>-addquerytobookmarks=Add search query to bookmarks
I think these are still used. r+sr=me on the rest.
Attachment #347165 - Flags: superreview?(neil)
Attachment #347165 - Flags: superreview+
Attachment #347165 - Flags: review?(neil)
Attachment #347165 - Flags: review+

Updated

9 years ago
Attachment #347177 - Flags: superreview?(neil)
Attachment #347177 - Flags: superreview+
Attachment #347177 - Flags: review?(neil)
Attachment #347177 - Flags: review+
Created attachment 347179 [details] [diff] [review]
combined patch for checkin (checked in)

Combines:
- common part, dtds
- common part, properties
- remove bookmarksOverlay

Fixes:
- do not touch history files
- do not add unnecessary whitespaces
- do not remove still used strings from search-panel.properties

Comment 14

9 years ago
Comment on attachment 347179 [details] [diff] [review]
combined patch for checkin (checked in)

Pushed as http://hg.mozilla.org/comm-central/rev/dd2de0997684 and http://hg.mozilla.org/comm-central/rev/5481635e0b6e (file removal got dropped by using rollback and committing again, I pushed it as a second changeset when I realized that)
Attachment #347179 - Attachment description: combined patch for checkin → combined patch for checkin (checked in)
Created attachment 347372 [details] [diff] [review]
mailnews part,dtds,v1
Attachment #347372 - Flags: superreview?(neil)
Attachment #347372 - Flags: review?(neil)
Comment on attachment 347372 [details] [diff] [review]
mailnews part,dtds,v1

>-        <vbox flex="1">
We're incidentally relying on this flex to keep the throbber to the right.
(I'm not sure offhand what happens to this when we get customisation.)

>-<!ENTITY RemoveButton.label             "Remove">
> <!ENTITY UpButton.label                 "Move Up">
> <!ENTITY DownButton.label               "Move Down">
I don't think any of these are used.

> <!ENTITY stopButton.tooltip                             "Stop the current transfer"> 
> <!ENTITY searchButton.tooltip                           "Search the selected address book"> 
You removed the XUL for these above...

>-<!ENTITY clearButton.tooltip                            "Clear the search criteria and show all entries">
We removed that button recently :-( Shame on us.

>-<!ENTITY quoteButton.label "Quote">

>-<!ENTITY quoteButton.tooltip "Quote the previous message"> 
Hmm, I'm surprised there's no bug to port the Quote button to SeaMonkey.

>-<!ENTITY customizeToolbar.label                 "Customize…">
>-<!ENTITY customizeToolbar.accesskey             "C">
Now there is a bug for customisation - I wonder whether it uses this or not.

>-<!ENTITY backCmd.label ".Back">
>-<!ENTITY backCmd.accesskey "B">
>-<!ENTITY forwardCmd.label ".Forward">
>-<!ENTITY forwardCmd.accesskey "F">
Whoa, back and forward got added recently, and they duplicated entities?
Oh, they added them with a go prefix :-(

> <!ENTITY viewPicker.label "View:">
>-<!ENTITY viewPicker.accesskey "i">
Wait a sec, how did we forget this? Doesn't belong on the control?

>-<!ENTITY duplicateButton.label "Duplicate">
> <!ENTITY removeButton.label "Remove Account">
> <!ENTITY removeButton.accesskey "R">
>-
>-<!ENTITY duplicate.label "Duplicate">
Oh wow! Our duplicate obsolete entity was for "Duplicate" :-)

> <!ENTITY serverTitle.label "Server Information">
>-<!ENTITY incomingServerTitle.label "Incoming Server">
>-<!ENTITY smtpServerTitle.label "Outgoing Server (SMTP)">
I wonder whether these used to be separate pages...

>-<!ENTITY draftMailFolder.label "Keep message drafts in:">
>-<!ENTITY templateMailFolder.label "Keep message templates in:">
Great, so we get to keep the misspelled version of the entity :-(

>-<!ENTITY disk.label                       "Disk Space">
Don't we use this in the account manager?

> <!ENTITY sizeColumn.label "Size">
> <!ENTITY junkStatusColumn.label "Junk Status">
>-<!ENTITY linesColumn.label "Lines">
I know this one! The size column now shows lines for newsgroups.
Created attachment 347607 [details] [diff] [review]
mailnews part,dtds,v2

(In reply to comment #16)
> (From update of attachment 347372 [details] [diff] [review])
> >-        <vbox flex="1">
> We're incidentally relying on this flex to keep the throbber to the right.
> (I'm not sure offhand what happens to this when we get customisation.)
> 
done with <spacer flex="1"/> similarly to other suite windows

> >-<!ENTITY RemoveButton.label             "Remove">
> > <!ENTITY UpButton.label                 "Move Up">
> > <!ENTITY DownButton.label               "Move Down">
> I don't think any of these are used.
>
yep, added to patch
 
> > <!ENTITY stopButton.tooltip                             "Stop the current transfer"> 
> > <!ENTITY searchButton.tooltip                           "Search the selected address book"> 
> You removed the XUL for these above...
> 
right, in patch now

> >-<!ENTITY customizeToolbar.label                 "Customize…">
> >-<!ENTITY customizeToolbar.accesskey             "C">
> Now there is a bug for customisation - I wonder whether it uses this or not.
> 
Patches in bug 394288 or bug 428216 don't mention these.
 
> > <!ENTITY viewPicker.label "View:">
> >-<!ENTITY viewPicker.accesskey "i">
> Wait a sec, how did we forget this? Doesn't belong on the control?
> 
Right, let's use it. TB has it too.

> > <!ENTITY serverTitle.label "Server Information">
> >-<!ENTITY incomingServerTitle.label "Incoming Server">
> >-<!ENTITY smtpServerTitle.label "Outgoing Server (SMTP)">
> I wonder whether these used to be separate pages...
> 
No clue :)

> >-<!ENTITY disk.label                       "Disk Space">
> Don't we use this in the account manager?
> 
mxr says: no
Attachment #347372 - Attachment is obsolete: true
Attachment #347607 - Flags: superreview?(neil)
Attachment #347607 - Flags: review?(neil)
Attachment #347372 - Flags: superreview?(neil)
Attachment #347372 - Flags: review?(neil)

Updated

9 years ago
Attachment #347607 - Flags: superreview?(neil)
Attachment #347607 - Flags: superreview+
Attachment #347607 - Flags: review?(neil)
Attachment #347607 - Flags: review+
Comment on attachment 347607 [details] [diff] [review]
mailnews part,dtds,v2

Silly me, I was thinking of the account manager, which has separate disk and offline panels depending on the type of account; preferences does not.

Comment 19

9 years ago
(In reply to comment #17)
> > >-<!ENTITY customizeToolbar.label                 "Customize…">
> > >-<!ENTITY customizeToolbar.accesskey             "C">
> > Now there is a bug for customisation - I wonder whether it uses this or not.
> > 
> Patches in bug 394288 or bug 428216 don't mention these.

IIRC, I added that because Lightning depended on it, but they are currently reworking everything to not even need a toolbar (only the mailnews tabbar) any more, AFAIK.
Created attachment 347775 [details] [diff] [review]
mailnews part,dtds,for checkin (checked in)

heh, we must not remove viewPicker.accesskey when this patch is actually adding it to the code

ready for checkin

Comment 21

9 years ago
Comment on attachment 347775 [details] [diff] [review]
mailnews part,dtds,for checkin (checked in)

Pushed as http://hg.mozilla.org/comm-central/rev/85fd61967f44 per IRC request from Vlado.
Attachment #347775 - Attachment description: mailnews part,dtds,for checkin → mailnews part,dtds,for checkin (checked in)
Created attachment 348182 [details] [diff] [review]
mailnews part,properties,v1 (checked in)
Attachment #348182 - Flags: superreview?(neil)
Attachment #348182 - Flags: review?(neil)

Updated

9 years ago
Attachment #348182 - Flags: superreview?(neil)
Attachment #348182 - Flags: superreview+
Attachment #348182 - Flags: review?(neil)
Attachment #348182 - Flags: review+

Comment 23

9 years ago
Comment on attachment 348182 [details] [diff] [review]
mailnews part,properties,v1 (checked in)

pushed as http://hg.mozilla.org/comm-central/rev/2001b287dcbe - Vlado, please mark the bug fixed when everything here is done.
Attachment #348182 - Attachment description: mailnews part,properties,v1 → mailnews part,properties,v1 (checked in)
Created attachment 348439 [details] [diff] [review]
one more string to kill (checked in)

Meantime the bug 63941 obsoleted but haven't removed this addressbook's string
Attachment #348439 - Flags: superreview?(neil)
Attachment #348439 - Flags: review?(neil)

Updated

9 years ago
Attachment #348439 - Flags: superreview?(neil)
Attachment #348439 - Flags: superreview+
Attachment #348439 - Flags: review?(neil)
Attachment #348439 - Flags: review+

Updated

9 years ago
Attachment #348439 - Attachment description: one more string to kill → one more string to kill (checked in)

Comment 25

9 years ago
Comment on attachment 348439 [details] [diff] [review]
one more string to kill (checked in)

Pushed as http://hg.mozilla.org/comm-central/rev/8d9666167d33
This is fixed with 370 strings in total removed.
Status: NEW → RESOLVED
Last Resolved: 9 years ago
Resolution: --- → FIXED
Blocks: 523573
You need to log in before you can comment on or make changes to this bug.