Bug 808850 - Update en-GB for Chatzilla 0.9.89 r=pending CALENDAR_2_0b1_BUILD1 CALENDAR_2_0b1_RELEASE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 10 Nov 2012 09:53:46 +0000
changeset 233 539a186763f268450f65e147e0a20ecfca3e6832
parent 232 590be3959e9b08a7422c7e24c0fb082f303346ae
child 234 f28447ec86d9bf90a7451aa0cde89e5769ab834c
child 236 3d3b3bd0f9d65214fd9f2a29cd10b5bb0760757f
push id37
push useriann_cvs@blueyonder.co.uk
push dateSat, 10 Nov 2012 09:57:04 +0000
reviewerspending
bugs808850
Bug 808850 - Update en-GB for Chatzilla 0.9.89 r=pending
extensions/irc/chrome/channels.dtd
extensions/irc/chrome/chatzilla.properties
--- a/extensions/irc/chrome/channels.dtd
+++ b/extensions/irc/chrome/channels.dtd
@@ -1,27 +1,33 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY window.title  "Join Channel">
 
-<!ENTITY qsearch.label     "Quick Search:">
-<!ENTITY qsearch.accesskey "S">
+<!ENTITY network.label     "Network:">
+<!ENTITY network.accesskey "N">
+
+<!ENTITY channel.label     "Channel:">
+<!ENTITY channel.accesskey "C">
 
 <!ENTITY topics.label     "Search topics as well as channel names">
 <!ENTITY topics.accesskey "t">
 
 <!ENTITY join.label     "Join">
 <!ENTITY join.accesskey "J">
 
 <!ENTITY minusers.label     "Min users:">
-<!ENTITY minusers.accesskey "n">
+<!ENTITY minusers.accesskey "M">
 
 <!ENTITY maxusers.label     "Max users:">
 <!ENTITY maxusers.accesskey "x">
 
 <!ENTITY refresh.label     "Refresh Now">
 <!ENTITY refresh.accesskey "">
 
+<!ENTITY network.hint.label "Enter any network or server name (you can include a port) and a channel to join.">
+
+<!ENTITY col.network "Network">
 <!ENTITY col.name  "Name">
 <!ENTITY col.users "Users">
 <!ENTITY col.topic "Topic">
--- a/extensions/irc/chrome/chatzilla.properties
+++ b/extensions/irc/chrome/chatzilla.properties
@@ -448,17 +448,17 @@ cmd.install-plugin.help   = Installs a C
 cmd.install-plugin.label  = &Install Plugin…
 
 cmd.invite.params = <nickname> [<channel-name>]
 cmd.invite.help   = Invites <nickname> to <channel-name> or current channel if not supplied. Requires operator status if +i is set.
 
 cmd.j.params = <channel-name> [<key>]
 cmd.j.help   = This command is an alias for /join.
 
-cmd.join.label  = &Join channel…
+cmd.join.label  = &Join Channel…
 cmd.join.key    = accel J
 cmd.join.params = [<channel-name> [<key>]]
 cmd.join.help   = Joins the global (name starts with #), local (name starts with &), or modeless (name starts with a +) channel named <channel-name>.  If no prefix is given, # is assumed.  Provides the key <key> if specified.
 
 cmd.join-charset.params = [<channel-name> <charset> [<key>]]
 cmd.join-charset.help   = Joins the global (name starts with #), local (name starts with &), or modeless (name starts with a +) channel named <channel-name>.  Messages will be encoded and decoded according to the character encoding specified by <charset>.  The <charset> parameter is independent of the default character encoding, which can be selected with the /charset command.  If no prefix is given, # is assumed.  Provides the key <key> if specified.
 
 cmd.jump-to-anchor.params = <anchor> [<channel-name>]
@@ -484,17 +484,17 @@ cmd.label-user.help   =
 
 cmd.label-user-multi.format = «$userCount users»
 cmd.label-user-multi.label  = <unknown>
 cmd.label-user-multi.params = <unspecified>
 cmd.label-user-multi.help   =
 
 cmd.leave.format = Leave $channelName
 cmd.leave.label  = &Leave
-cmd.leave.params = [<channel-name> [<reason>]]
+cmd.leave.params = [<channel-name>] [<reason>]
 cmd.leave.help   = Leaves the current channel. Use /delete to force the view to go away, losing its contents, or /hide to temporarily hide it, preserving its contents. Many servers do not support the optional <reason> parameter. Your preferences are used to determine whether to delete the tab. If you are dispatching this command from a script, you may override this behaviour with the <delete-when-done> parameter.
 
 cmd.links.help   = Displays the "links" to the current server. This is a list of the other servers in the network which are directly connected to the one you are connected to.
 
 cmd.list.params = [<channel-name>]
 cmd.list.help   = Lists channel name, user count, and topic information for the network/server you are attached to.  If you omit the optional channel argument, all channels will be listed.  On large networks, the server may disconnect you for asking for a complete list.
 
 cmd.list-plugins.params = [<plugin>]
@@ -770,17 +770,17 @@ msg.err.no.ctcp.cmd   = %S is not a vali
 msg.err.no.ctcp.help  = %S does not have any help information
 msg.err.unknown.host  = The host application UID "%S" is not recognised. Please report what application you are running ChatZilla in, and the UID given.
 msg.err.unable.to.print = The current view does not support printing.
 msg.err.unsupported.command = The server does not support the ``%S'' command.
 msg.err.invalid.mode  = The mode string you entered (``%S'') is invalid. A valid mode string consists of one or more sequences of a + or - followed by one or more alphabetical characters.
 msg.err.away.save     = Saving the list of away messages failed (%S).
 msg.err.inputhistory.not.writable = Unable to save input history to ``%S''.
 msg.err.urls.not.writable = Unable to save URL log to ``%S''.
-msg.err.invalid.url   = ``%S'' is not a valid url nor an alias for a url, and therefor could not be loaded.
+msg.err.invalid.url   = ``%S'' is not a valid url nor an alias for a url, and therefore could not be loaded.
 msg.err.no.channel    = When running the ``%S'' command, you should either provide a channel name, or run the command in the context of a channel.
 msg.err.no.idleservice = ChatZilla can't determine when you're away in your version of &brandShortName;. The auto-away feature will now be disabled.
 
 msg.warn.pac.loading = The automatic proxy configuration file has not loaded yet; ChatZilla will retry shortly.
 
 # Specific bug messages.
 msg.bug318419.warning = ChatZilla has detected a potential abnormality in its internal data. You will not be able to send any form of communication at this time, although it might appear you can. The most likely cause is Mozilla Bug 318419 <https://bugzilla.mozilla.org/show_bug.cgi?id=318419>. You are strongly advised to restart the host application (&brandShortName;) to prevent further problems.
 msg.bug318419.error   = ChatZilla has detected a serious abnormality in its internal data. You will not be able to send any form of communication at this time, although it might appear you can. The most likely cause is Mozilla Bug 318419 <https://bugzilla.mozilla.org/show_bug.cgi?id=318419>. You MUST restart the host application (&brandShortName;) to fix this.
@@ -1307,17 +1307,20 @@ msg.supports.flagsOff = This server DOES
 msg.supports.miscOption = "%S=%S"
 msg.supports.miscOptions = Server settings/limits: %S"
 
 
 msg.conf.mode.on     = Conference Mode has been enabled for this view; joins, leaves, quits and nickname changes will be hidden.
 msg.conf.mode.stayon = Conference Mode is enabled for this view; joins, leaves, quits and nickname changes are hidden.
 msg.conf.mode.off    = Conference Mode has been disabled for this view; joins, leaves, quits and nickname changes will be shown.
 
-msg.cd.title      = Join Channel on %S (%S)
+# Join Network/Channel dialog
+msg.cd.updated    = Network's channel list cached on %S"
+msg.cd.updated.format = %e %B %Y
+msg.cd.updated.never = Network's channel list not cached
 msg.cd.create     = <create new channel>
 msg.cd.filtering  = Filtered %S of %S channels…
 msg.cd.showing    = Showing %S of %S channels.
 msg.cd.wait.list  = Waiting for current list operation to finish…
 msg.cd.fetching   = Fetching channel list…
 msg.cd.fetched    = Fetched %S channels…
 msg.cd.error.list = There was an error loading the channel list.
 msg.cd.loaded     = Loaded %S channels…
@@ -1446,18 +1449,16 @@ msg.prefs.global              = Global S
 pref.activityFlashDelay.label   = Activity flash delay
 pref.activityFlashDelay.help    = When a tab that has had activity gets more activity, the tab is flashed. This preference is the length of the flash in milliseconds: 0 disables it.
 pref.aliases.label              = Command aliases
 pref.aliases.help               = Allows you to make shortcuts to various commands or sequences of commands. Each item is of the form "<name> = <command-list>". The command-list is a list of commands (without the leading "/") along with their parameters, each separated by ";". The name of the alias will automatically be turned into a command when ChatZilla starts.
 pref.autoAwayCap.label          = Auto away-check user limit
 pref.autoAwayCap.help           = ChatZilla automatically checks which users are here and which are away in each channel you are a member of, however, this causes significant lag on larger channels. Any channel bigger than this limit won't be checked.
 pref.autoAwayPeriod.label       = Auto away-check period length
 pref.autoAwayPeriod.help        = ChatZilla automatically checks which users are here and which are away in each channel you are a member of. This specifies how many minutes should pass between checks.
-pref.autoperform.label          = Auto-perform
-pref.autoperform.help           = When connecting to a server, you might want to send some commands automatically. Simply enter each command in this list (without the leading "/"), with parameters, and ChatZilla will do it all for you. The commands are run in the order listed.
 pref.autoRejoin.label           = Rejoin when kicked
 pref.autoRejoin.help            = If this is turned on, ChatZilla will try (only once) to rejoin a channel you got kicked from. Note, some channels dislike auto-rejoin, and will ban you, so be careful.
 pref.away.label                 = Away status
 pref.away.help                  =
 pref.awayIdleTime.label         = Auto-away timeout
 pref.awayIdleTime.help          = After how many minutes of inactivity ChatZilla will set your status to "away". This only works on newer versions of &brandShortName;. Set to 0 to disable it.
 pref.awayIdleMsg.label          = Auto-away message
 pref.awayIdleMsg.help           = The away message ChatZilla will use when you go away.
@@ -1674,16 +1675,27 @@ pref.group.global.maxLines.label       =
 pref.group.global.maxLines.help        = The number of lines of text to keep in this view type. Once the limit is reached, the oldest lines are removed as new lines are added.
 pref.group.global.sounds.label         = Sound Configuration
 pref.group.global.sounds.help          =
 pref.group.global.soundEvts.label      = Sound Events
 pref.group.global.soundEvts.help       = Sounds for certain client events. These preferences are a space-separated list of either "beep" or file: URLs.
 
 # These are the prefs that get grouped #
 
+pref.autoperform.label          = Auto-perform
+pref.autoperform.help           = Enter any commands to be run when connecting to this network/joining this channel/opening this user's private chat. The commands are run in the order listed.
+pref.autoperform.channel.label  = Channel
+pref.autoperform.channel.help   = Enter any commands to be run when joining any channel.
+pref.autoperform.client.label   = Client
+pref.autoperform.client.help    = Enter any commands to be run when starting ChatZilla.
+pref.autoperform.network.label  = Network
+pref.autoperform.network.help   = Enter any commands to be run when connecting to any network.
+pref.autoperform.user.label     = User
+pref.autoperform.user.help      = Enter any commands to be run when opening any user's private chat.
+
 pref.networkHeader.label        = Networks
 pref.networkHeader.help         =
 pref.channelHeader.label        = Channels
 pref.channelHeader.help         =
 pref.userHeader.label           = Users
 pref.userHeader.help            =
 pref.dccUserHeader.label        = DCC
 pref.dccUserHeader.help         =