Cleanup, finished sidebar keys

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1029 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/messenger_i18n_en.properties

@@ -2,40 +2,45 @@
 # $Revision$
 # $Date$
 
-# This resource bundle file is the default resource bundle that will be
-# used by Jive if a resource bundle for a specific Locale cannot be found.
-#
-# Additional locales can be specified by creating a new resource file in this
-# directory using the following conventions:
-#
-#   jive_i18n "_" language "_" country ".properties"
-#   jive_i18n "_" language ".properties"
-#
-# e.g.
-#    jive_i18n_en.propertis       <- English resources
-#    jive_i18n_en_US.properties   <- American US resources
-#    jive_i18n_de.properties      <- German resources
-#    jive_i18n_ja.properties      <- Japanese resources
-#
-# Please note that the two digit language code should be lower case, and the
-# two digit country code should be in uppercase. Often, it is not necessary to
-# specify the country code.
-#
-# A full list of language codes can be found at
-# http://www-old.ics.uci.edu/pub/ietf/http/related/iso639.txt
-# and a full list of country codes can be found at
-# http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-#
-# In property strings that are parameterized, single quotes can be used to
-# quote the "{" (curly brace) if necessary. A real single quote is represented by ''.
-#
-# REVISION HISTORY (by Jive Messenger version):
-#
-#   2.1.2
-#       * Initial version
-#
-
-# Sidebar, tabs:
+##
+## Jive Messenger Resource Bundle
+##
+## Additional locales can be specified by creating a new resource file in this
+## directory using the following conventions:
+##
+##   messenger_i18n "_" language "_" country ".properties"
+##   messenger_i18n "_" language ".properties"
+##
+## e.g.
+##    messenger_i18n_en.propertis       <- English resources
+##    messenger_i18n_en_US.properties   <- American US resources
+##    messenger_i18n_de.properties      <- German resources
+##    messenger_i18n_ja.properties      <- Japanese resources
+##
+## Please note that the two digit language code should be lower case, and the
+## two digit country code should be in uppercase. Often, it is not necessary to
+## specify the country code.
+##
+## A full list of language codes can be found at
+## http://www-old.ics.uci.edu/pub/ietf/http/related/iso639.txt
+## and a full list of country codes can be found at
+## http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
+##
+## In property strings that are parameterized, single quotes can be used to
+## quote the "{" (curly brace) if necessary. A real single quote is represented by ''.
+##
+## REVISION HISTORY (by messenger Messenger version):
+##
+##   2.1.2
+##       * Initial version
+##
+
+# Messenger
+
+short.title = Jive Messenger
+title = Jive Messenger
+
+# Sidebar, tabs (preserve the indenting below -- helps to visualize the structure:
 
 tab.server=Server
 tab.server.descr=Click to manage server settings
@@ -97,6 +102,7 @@ tab.tab-session.descr=Click to manage connected sessions
     sidebar.user-message.descr=Click to send a message
 tab.tab-groupchat=Group Chat
 tab.tab-groupchat.descr=Click to manage group chat setting
+    sidebar.sidebar-groupchat-settings=Group Chat Settings
         sidebar.muc-server-props=Service Properties
         sidebar.muc-server-props.descr=
         sidebar.muc-history=History Settings
@@ -107,13 +113,19 @@ tab.tab-groupchat.descr=Click to manage group chat setting
         sidebar.muc-perms.descr=
         sidebar.muc-tasks=Other Settings
         sidebar.muc-tasks.descr=
-
+    sidebar.sidebar-groupchat-administration=Room Administration
         sidebar.muc-room-summary=Room Summary
         sidebar.muc-room-summary.descr=Click to see a list of rooms in the service
+            sidebar.sidebar-groupchat-options=Room Options
+                sidebar.muc-room-edit-form=Room Settings
+                sidebar.muc-room-edit-form.descr=Click to edit the room's configuration
+                sidebar.muc-room-affiliations=User Permissions
+                sidebar.muc-room-affiliations.descr=Click to edit user permissions
+                sidebar.muc-room-delete=Delete Room
+                sidebar.muc-room-delete.descr=Click to delete the room
         sidebar.muc-room-create=Create New Room
         sidebar.muc-room-create.descr=Click to add a new room to the service
 
-
 # Server startup messages
 
 startup.name=Jive Messenger {0} Started [{1}]
@@ -129,6 +141,7 @@ startup.error.jivehome=Could not locate messengerHome. Set the messengerHome pro
 startup.missing-plugins=Could not locate the plugins directory. Possibly corrupt installation. No plugins will be loaded.
 
 # Standard server error messages (for server admin)
+
 admin.error=Internal server error
 admin.error.accept=Trouble accepting connection
 admin.error.bad-stream=Bad opening tag (not stream)
@@ -150,18 +163,20 @@ admin.drop-packet=Dropping unrecognized packet
 admin.disconnect=Stream cut short (could be normal disconnect)
 
 # Server messages (for server admin)
+
 admin.password.update={0} updated password from session {1}
 admin.authenticated={0} authenticated on connection {1}
 admin.warn.license=License limit exceeded, refusing user connection
 admin.error.license=Could not license plugin {0}
 
-# Server messages (too users)
+# Server messages (to users)
+
 user.license=Try logging in later or contact your system administrator
 user.license.title=Too many users logged in
-
 admin.shutdown.now=The server is shutting down immediately
 
 # XMPP error codes
+
 xmpp.error.302=Redirect
 xmpp.error.400=Bad Request
 xmpp.error.401=Unauthorized
@@ -181,23 +196,29 @@ xmpp.error.504=Remote Server Timeout
 xmpp.error.unknown=Unknown error code
 
 # Chat server messages
+
 chat.join={0} has joined the room
 chat.leave={0} has left the room
 chat.error.not-supported=Chat client attempted to access unimplemented feature
 
 # Multi User Chat server messages
+
 muc.error.not-supported=Chat client attempted to access unimplemented feature
 muc.new=This room is locked from entry until configuration is confirmed.
 muc.locked=This room is now locked.
 muc.unlocked=This room is now unlocked.
 muc.warnnonanonymous=This room is not anonymous.
 muc.roomIsNowMembersOnly=This room is now members-only.
+
 # Labels for extended info (dataform) returned for disco#info requests
+
 muc.extended.info.desc=Description
 muc.extended.info.subject=Subject
 muc.extended.info.occupants=Number of occupants
 muc.extended.info.creationdate=Creation date
+
 # Labels for room registration data form
+
 muc.form.reg.title=Registration with the room
 muc.form.reg.instruction=Please provide the following information to register with this room.
 muc.form.reg.first-name=First Name
@@ -206,10 +227,12 @@ muc.form.reg.nickname=Desired Nickname
 muc.form.reg.url=Your URL
 muc.form.reg.email=Email Address
 muc.form.reg.faqentry=FAQ Entry
+
 # Labels for room configuration data form
+
 muc.form.conf.title=Room configuration
 muc.form.conf.instruction=The room "{0}" has been created. To accept the default configuration, \
-click the "OK" button. Or, modify the settings by completing the following form:
+        click the "OK" button. Or, modify the settings by completing the following form:
 muc.form.conf.owner_roomname=Room Name
 muc.form.conf.owner_roomdesc=Description
 muc.form.conf.owner_changesubject=Allow Occupants to Change Subject
@@ -227,27 +250,25 @@ muc.form.conf.allowinvitesfixed=Note: by default, only admins can send invitatio
 muc.form.conf.owner_allowinvites=Allow Occupants to Invite Others
 muc.form.conf.owner_passwordprotectedroom=Password Required to Enter Room
 muc.form.conf.roomsecretfixed=If a password is required to enter this room, you must specify the \
-password below.
+        password below.
 muc.form.conf.owner_roomsecret=Password
 muc.form.conf.owner_whois=Role that May Discover Real JIDs of Occupants
 muc.form.conf.anyone=Anyone
 muc.form.conf.owner_enablelogging=Log Room Conversations
 muc.form.conf.roomadminsfixed=You may specify administrators of this room. \
-Please provide one JID per line.
+        Please provide one JID per line.
 muc.form.conf.owner_roomadmins=Room Admins
 muc.form.conf.roomownersfixed=You may specify additional owners for this room. Please provide \
-one JID per line.
+        one JID per line.
 muc.form.conf.owner_roomowners=Room Owners
 
-# Messenger 
-short.title = Jive Messenger
-title = Jive Messenger
-
 # Admin Console Pages below
+
 global.restart=restart
 global.server_status=Server Status
 
 # Group Chat Service Properties Page
+
 groupchat.service.properties.title=Group Chat Service Properties
 groupchat.service.properties.introduction=Use the form below to edit group chat service settings. Note, any changes will require a server restart.
 groupchat.service.properties.saved_successfully=Service properties edited successfully. You must
@@ -259,6 +280,7 @@ groupchat.service.properties.error_service_name=Please enter a valid name.
 groupchat.service.properties.save=Save Properties
 
 # Group Chat History Settings Page
+
 groupchat.history.settings.title=Group Chat History Settings
 groupchat.history.settings.introduction=Group chat rooms can replay conversation histories to provide context to new members joining a room. There are several options for controlling how much history to store for each room.
 groupchat.history.settings.saved_successfully=Settings updated successfully.
@@ -273,6 +295,7 @@ groupchat.history.settings.messages=messages
 groupchat.history.settings.save=Save Settings
 
 # Group Chat Administrators Page
+
 groupchat.admins.title=Group Chat Administrators
 groupchat.admins.introduction=Below is the list of system administrators of the group chat service. System administrators can enter any group chat room and their permissions are the same as the room owner.
 groupchat.admins.user_added=User added to the list successfully.
@@ -287,7 +310,8 @@ groupchat.admins.no_admins=No administrators specified, use the form above to ad
 groupchat.admins.dialog.title=Click to delete...
 groupchat.admins.dialog.text=Are you sure you want to remove this user from the list?
 
-#audit policy Page
+# Audit policy Page
+
 audit.policy.title=Audit Policy
 audit.policy.settings.saved_successfully=Settings updated successfully.
 audit.policy.title_info=can audit XMPP traffic on the server and save the data to XML data files. The amount of data sent via an XMPP server can be substantial. Messenger provides several settings to control whether to audit packets, how audit files are created, and the types of packets to save. In most cases, logging Message packets will provide all of the data an enterprise requires. Presence and IQ packets are primarily useful for tracing and troubleshooting XMPP deployments.
@@ -306,7 +330,8 @@ audit.policy.label_audit_presence_packets=Audit Presence Packets
 audit.policy.label_audit_iq_packets=Audit IQ Packets
 audit.policy.queued_packets=Queued packets:
 
-#chatroom history settings Page
+# Chatroom history settings Page
+
 chatroom.history.settings.title=Chat Room History Settings
 chatroom.history.settings.saved_successfully=Settings updated successfully.
 chatroom.history.settings.info_response1=Chatrooms can replay conversation histories to provide context to new members joining a room.
@@ -319,22 +344,24 @@ chatroom.history.settings.label_show_Entire_content=- Show the entire chat histo
 chatroom.history.settings.label_show_message_number_title=Show a Specific Number of Messages
 chatroom.history.settings.label_show_message_number_content=Show a specific number of the most recent messages in the chat. Use the box below to specify that number.
 
-#error Page
+# Error Page
+
 error.admin_privileges=You don't have admin privileges to perform this operation.
-error.requested_user=The requested user
-error.username=(username:
-error.not_found=was not found.
+error.requested_user_not_found=The requested user was not found.
+error.specific_user_not_found=The requested user ({0}) was not found.
 error.not_found_group=The requested group was not found.
 error.exception=Exception:
 
-#error serverdown Page
+# Error serverdown Page
+
 error.serverdown.title=Server Down
 error.serverdown.admin_console=Admin Console
 error.serverdown.is_down=is currently down. To continue:
 error.serverdown.start=Start the server.
 error.serverdown.login=Login to the admin console
 
-#group create Page
+# Group create Page
+
 group.create.title=Create Group
 group.create.error=Error creating the group. Please check your error logs.
 group.create.form=Use the form below to create a group.
@@ -356,12 +383,14 @@ group.create.show_group_in_group_members=Show group in group members' rosters
 group.create.show_group_in_roster_group=Show group to members' rosters of these groups:
 group.create.required_fields=Required fields
 
-#group delete Page
+# Group delete Page
+
 group.delete.title=Delete Group
 group.delete.hint_info=Are you sure you want to delete the group
 group.delete.hint_info1=from the system?
 
-#group edit Page
+# Group edit Page
+
 group.edit.title=Edit Group
 group.edit.form_info=Edit group settings and add or remove group members and administrators using the forms below.
 group.edit.update=Group information updated successfully.
@@ -388,7 +417,8 @@ group.edit.admin=Admin
 group.edit.remove=Remove
 group.edit.user_hint=No members in this group. Use the form above to add some.
 
-#group summary Page
+# Group summary Page
+
 group.summary.title=Group Summary
 group.summary.list_group=Below is a list of the groups in the system.
 group.summary.delete_group=Group deleted successfully.
@@ -404,11 +434,12 @@ group.summary.no_groups=No groups in the system.
 group.summary.click_edit="Click to edit..."
 group.summary.click_delete="Click to delete..."
 
+# Header Page
 
-#header Page
 header.admin=Admin
 
-#index Page
+# Index Page
+
 index.title=Server Settings
 index.title.info=Below are properties for this server. Click the "Edit Properties" button below to change some of the server settings. Some settings can not be changed.
 index.properties=Server Properties
@@ -427,14 +458,14 @@ index.app=Appserver:
 index.os=OS / Hardware:
 index.local=Locale / Timezone:
 
-
 # Locale Page
+
 locale.title=Server Locale
 locale.title.info=Use the form below to set the system locale. By default, the locale is the system default locale and the language is English.
 locale.system.set=Set System Locale
 
+# License details Page
 
-#license details Page
 license.details.info=The following is a summary of your
 license.details.info1=license.
 license.details.details=License Details
@@ -444,10 +475,12 @@ license.details.unlimited=Unlimited
 license.details.expiration_date=Expiration Date:
 license.details.expiration_date_never=Never
 
-#log Page
+# Log Page
+
 log.line=line
 
-#login Page
+# Login Page
+
 login.title=Admin Console
 login.hint=Admin Console Login
 login.error=Error: You don't have JavaScript enabled. This tool uses JavaScript and much of it will not work correctly without it enabled. Please turn JavaScript back on and reload this page.
@@ -456,7 +489,8 @@ login.username=username
 login.password=password
 login.version=Version
 
-#logviewer Page
+# Logviewer Page
+
 logviewer.title=Log Viewer
 logviewer.error=Error
 logviewer.warn=Warn
@@ -480,7 +514,8 @@ logviewer.seconds=seconds
 logviewer.debug_log=Debug Log
 logviewer.enabled=Enabled
 
-#muc create permission Page
+# Muc create permission Page
+
 muc.create.permission.title=Room Creation Permissions
 muc.create.permission.info=Use the form below to configure the policy for who can create group chat rooms.
 muc.create.permission.error=Error adding the user. Please verify the JID is correct.
@@ -496,7 +531,8 @@ muc.create.permission.no_allowed_users=No allowed users, use the form above to a
 muc.create.permission.click_title=Click to delete...
 muc.create.permission.confirm_remove=Are you sure you want to remove this user from the list?
 
-#muc room affiliations Page
+# Muc room affiliations Page
+
 muc.room.affiliations.title=User Permissions
 muc.room.affiliations.info=Below is the list of room owners, administrators, members and outcasts of the the room
 muc.room.affiliations.info_detail=Room owners can alter the room configuration, grant ownership and administrative privileges to users and destroy the room. Room administrators can ban, grant membership and moderator privileges to users. Room members are the only allowed users to join the room when it is configured as members-only. Whilst room outcasts are users who have been banned from the room.
@@ -521,7 +557,8 @@ muc.room.affiliations.room_admin=Room Admins
 muc.room.affiliations.room_member=Room Members
 muc.room.affiliations.room_outcast=Room Outcasts
 
-#muc room delete Page
+# Muc room delete Page
+
 muc.room.delete.title=Destroy Room
 muc.room.delete.info=Are you sure you want to destroy the room
 muc.room.delete.detail=from the system? You may specify a reason for the room destruction and an alternative room address that will replace this room. This information will be sent to room occupants.
@@ -530,7 +567,8 @@ muc.room.delete.room_id=Room ID:
 muc.room.delete.reason=Reason:
 muc.room.delete.alternate_address=Alternate Room Address:
 
-#muc room edit form Page
+# Muc room edit form Page
+
 muc.room.edit.form.title=Room Administration
 muc.room.edit.form.edited=Room settings edited successfully.
 muc.room.edit.form.created=Room creation was successfully.
@@ -571,7 +609,8 @@ muc.room.edit.form.invite_other=Allow Occupants to invite Others
 muc.room.edit.form.change_subject=Allow Occupants to change Subject
 muc.room.edit.form.log=Log Room Conversations
 
-#muc room summary Page
+# Muc room summary Page
+
 muc.room.summary.title=Group Chat Rooms
 muc.room.summary.info=Below is an overview of the Group Chat Rooms in the system. From here you can view the rooms, edit their properties, and create new rooms.
 muc.room.summary.destroyed=Room destroyed successfully.
@@ -591,8 +630,8 @@ muc.room.summary.alt_temporary=Room is temporary
 muc.room.summary.click_edit=Click to edit...
 muc.room.summary.click_delete=Click to delete...
 
+# Muc tasks Page
 
-#muc tasks Page
 muc.tasks.title=Other Settings
 muc.tasks.info=Use the forms below to configure settings for kicking idle users from group chat rooms and to configure the task that logs room conversations to the database.
 muc.tasks.update=Idle user settings updated successfully.
@@ -608,7 +647,8 @@ muc.tasks.conversation.logging=Conversation Logging
 muc.tasks.flush=Flush interval (seconds):
 muc.tasks.batch=Batch size:
 
-#offline messages Page
+# Offline messages Page
+
 offline.messages.title=Offline Messages
 offline.messages.update=Settings updated successfully.
 offline.messages.info=XMPP provides the option for servers to store-and-forward IM messages when they are sent to a user that is not logged in. Supporting store-and-forward of 'offline messages' can be a very convenient feature of an XMPP deployment. However, offline messages, like email, can take up a significant amount of space on a server. There are several options for handling offline messages; select the policy that best suites your needs.
@@ -625,7 +665,8 @@ offline.messages.drop=Store or Drop
 offline.messages.drop_info=Store messages for a user up to the max storage size. After the max size has been exceeded, silently drop messages.
 offline.messages.storage_limit=Per-user offline message storage limit:
 
-#private data settings Page
+# Private data settings Page
+
 private.data.settings.title=Private Data
 private.data.settings.update=Settings updated successfully.
 private.data.settings.info=Private data storage allows XMPP clients to store settings, bookmarks, etc. on the server. Users can log into their account and their settings will follow them around (as opposed to having the clients store the settings on the local computer where their settings will not follow them). You may enable or disable this feature.
@@ -635,7 +676,8 @@ private.data.settings.enable_storage_info=allow clients to store information on
 private.data.settings.disable_storage=Disable Private Data Storage
 private.data.settings.disable_storage_info=do not allow server-side storage.
 
-#reg settings Page
+# Reg settings Page
+
 reg.settings.title=Registration Settings
 reg.settings.info=Use the forms below to change various aspects of user registration and login.
 reg.settings.update=Settings updated successfully.
@@ -650,7 +692,8 @@ reg.settings.anonymous_login_info=You can choose to enable or disable anonymous
 reg.settings.anyone_login=Anyone may login to the server.
 reg.settings.only_registered_login=Only registered users may login.
 
-#server db Page
+# Server db Page
+
 server.db.title=Database Properties
 server.db.info=Below is a list of properties for your database and the JDBC driver.
 server.db.connect_info=Database Connection Info
@@ -665,7 +708,8 @@ server.db.multiple_connect=Supports multiple connections
 server.db.multiple_connect2=open at once:
 server.db.read_only_mode=In read-only mode:
 
-#server properties Page
+# Server properties Page
+
 server.properties.title=System Properties
 server.properties.info=Below is a list of the system properties. Values for password sensitive fields are hidden. Long property names and values are clipped. Hold your mouse over the property name to see the full value or to see both the full name and value, click the edit icon next to the property.
 server.properties.system=System Properties
@@ -687,7 +731,8 @@ server.properties.enter_property_name=Please enter a property name.
 server.properties.enter_property_value=Please enter a property value.
 server.properties.max_character=1000 character max.
 
-#server props Page
+# Server props Page
+
 server.props.title=Edit Server Properties
 server.props.info=Use the form below to edit server properties.
 server.props.update=Server properties updated successfully. You'll need to
@@ -705,9 +750,10 @@ server.props.enable=Enabled
 server.props.disable=Disabled
 server.props.ssl_valid=Please enter a valid SSL port number or
 server.props.ssl_valid1=restore the default
-server.props.admin_port= Admin Console Port:
+server.props.admin_port=Admin Console Port:
+
+# Server stopped Page
 
-#server stopped Page
 server.stopped.title_restarting=Restarting Server
 server.stopped.title_stopped=Server stopped
 server.stopped.admin_console=Admin Console
@@ -718,7 +764,8 @@ server.stopped.stop=The server is being stopped.To continue:
 server.stopped.wait_restarted=Wait a few seconds and then
 server.stopped.wait_restarted2=the server.
 
-#session conflict Page
+# Session conflict Page
+
 session.conflict.title=Conflict Policy
 session.conflict.update=Settings updated successfully.
 session.conflict.info=XMPP allows multiple logins to the same user account by assigning a unique "resource name" to each connection. If a connection requests a resource name that is already in use, the server must decide how to handle the conflict. The options on this page allow you to determine if the server always kicks off existing connections, never kicks off existing connections, or sets the number of login attempts that should be rejected before kicking off an existing connection. The last option allows users to receive an error when logging in that allows them to request a different resource name.
@@ -733,7 +780,8 @@ session.conflict.kick_value=Assign kick value
 session.conflict.kick_value_info=Specify the number of login attempts allowed before conflicting resources are kicked. You must specify a number greater than one.
 session.conflict.enter_value=Please enter a value greater than 1.
 
-#session details Page
+# Session details Page
+
 session.details.title=Session Details
 session.details.info=Below are session details for the session
 session.details.info1=If the user
@@ -767,20 +815,23 @@ session.details.clientip=Client IP
 session.details.close_connect=Close Connection
 session.details.session_detail=Current session details above.
 
-#session filter Page
+# Session filter Page
+
 session.filter.title=Filter Session Summary by User
 session.filter.info=To filter the list of sessions by user, select the user from the list below or enter their username in the box below.
 session.filter.enter_username=Please enter a valid username or choose a username from the list.
 session.filter.specify_username=Specify username:
 session.filter.choose_user=Choose user:
 
-#session row Page
+# Session row Page
+
 session.row.cliked=Click for more info...
 session.row.cliked_ssl=User is connected via SSL
 session.row.cliked_kill_session=Click to kill session...
 session.row.confirm_close=Are you sure you want to close this connection?
 
-#session summary Page
+# Session summary Page
+
 session.summary.title=Session Summary
 session.summary.close=Session closed successfully.
 session.summary.active=Active Sessions
@@ -790,7 +841,8 @@ session.summary.info=Below is a list of sessions on this server.
 session.summary.not_session=No Sessions
 session.summary.last_update=List last updated
 
-#setup admin settings Page
+# Setup admin settings Page
+
 setup.admin.settings.account=Administrator Account
 setup.admin.settings.info=Enter settings for the system administrator account (username of "admin") below. It is important to choose a password for the account that cannot be easily guessed -- for example, at least six characters long and containing a mix of letters and numbers. You can skip this step if you have already setup your admin account (not for first time users).
 setup.admin.settings.error=There were errors when updating the admin account. Please see below.
@@ -806,7 +858,8 @@ setup.admin.settings.not_new_password=The new passwords do not match.
 setup.admin.settings.confirm_password=Confirm Password:
 setup.admin.settings.valid_confirm=Please enter a valid new confirmation password.
 
-#setup completed Page
+# Setup completed Page
+
 setup.completed.setup=Setup
 setup.completed.jive=Jive Software
 setup.completed.run=Setup Already Run
@@ -814,7 +867,8 @@ setup.completed.run_info=It appears setup has already been run. To administer yo
 setup.completed.run_info1=Admin Tool
 setup.completed.run_info2=To re-run setup, you need to stop your appserver, delete the "setup" property from the jive-messenger.xml file, restart Messenger then reload the setup tool.
 
-#setup datasource jndi Page
+# Setup datasource jndi Page
+
 setup.datasource.jndi.setting=Datasource Settings - JNDI Connection
 setup.datasource.jndi.setting_info=Choose a JNDI datasource below to connect to the 
 setup.datasource.jndi.setting_info1=database. The name varies between application servers, but it is generally of the form:
@@ -825,7 +879,8 @@ setup.datasource.jndi.valid_name=Please enter a valid JNDI name.
 setup.datasource.jndi.note=Note, it might take between 30-60 seconds to connect to your database.
 
 
-#setup datasource settings Page
+# Setup datasource settings Page
+
 setup.datasource.settings.title=Datasource Settings
 setup.datasource.settings.info=Choose how you would like to connect to the
 setup.datasource.settings.info1=database.
@@ -836,7 +891,8 @@ setup.datasource.settings.jndi_info=Use a datasource defined by your application
 setup.datasource.settings.embedded=Embedded Database
 setup.datasource.settings.embedded_info=Use an embedded database, powered by HSQLDB. This option requires no external database configuration and is an easy way to get running quickly. However, this is not recommended for large installations.
 
-#setup datasource standard Page
+# Setup datasource standard Page
+
 setup.datasource.standard.title=Datasource Settings - Standard Connection
 setup.datasource.standard.info=Specify a JDBC driver and connection properties to connect to your database. If you need more information about this process please see the database documentation distributed with setup.datasource.standard.note=
 setup.datasource.standard.info2=Note:
@@ -860,7 +916,8 @@ setup.datasource.standard.timeout_info=The time (in days) before connections in
 setup.datasource.standard.note=Note, it might take between 30-60 seconds to connect to your database.
 
 
-#setup env check Page
+# Setup env check Page
+
 setup.env.check.setup=Setup
 setup.env.check.error=Error: Can not proceed with
 setup.env.check.error_info=Your current installation fails to meet minimum
@@ -873,7 +930,8 @@ setup.env.check.jive=Jive Home Directory
 setup.env.check.not_home=Messenger Home Directory - Not Set
 setup.env.check.doc=Please read the installation documentation and try setting up your environment again. After making changes, restart your appserver and load this page again.
 
-#setup finished Page
+# Setup finished Page
+
 setup.finished.title=Setup Complete!
 setup.finished.info=This installation of
 setup.finished.info1=is now complete.To continue:
@@ -881,7 +939,8 @@ setup.finished.restart=Please
 setup.finished.restart2=the server.
 setup.finished.login=Login to the admin console
 
-#setup host settings Page
+# Setup host settings Page
+
 setup.host.settings.title=Server Settings
 setup.host.settings.info=Below are host settings for this server. Note: the suggested value for the domain is based on the network settings of this machine.
 setup.host.settings.domain=Domain:
@@ -897,7 +956,8 @@ setup.host.settings.yes=Yes
 setup.host.settings.no=No
 setup.host.settings.secure=Enables or disables secure XMPP connections.
 
-#setup index Page
+# Setup index Page
+
 setup.index.title=Setup Checklist
 setup.index.info=Welcome to
 setup.index.info1=Setup. This tool will lead you through the initial setup or upgrade process. Before continuing, verify that your environment meets all the requirements below.
@@ -914,15 +974,17 @@ setup.index.unable_locate_dir=Unable to locate valid conf directory. Please refe
 setup.index.not_permission=Setup was able to find your conf directory but does not have read permission on it. Please alter the directory permissions.
 setup.index.not_write_permission=Setup was able to find your conf directory but does not have write permission on it. Please alter the directory permissions.
 
-#setup pause Page
+# Setup pause Page
+
 setup.pause.title=Please restart your server and close this window. Launch the admin using either the launcher or start as a service to enter the admin tool.
 setup.pause.close=Close Window
 
+# Setup sidebar Page
 
-#setup sidebar Page
 setup.sidebar.title=Setup Progress
 
-#ssl-settings Page
+# SSL settings Page
+
 ssl.settings.title=SSL Security Settings
 ssl.settings.update=Settings updated successfully.
 ssl.settings.uninstalled=Certificate uninstalled successfully.
@@ -949,8 +1011,8 @@ ssl.settings.client=Client Certificate
 ssl.settings.a_certificate=Certificate
 ssl.settings.paste_certificate=Paste in the certificate sent to you by the CA or the self-signed certificate generated via the keytool.
 
+# User create Page
 
-#user create Page
 user.create.title=Create User
 user.create.info=Use the form below to create a new user.
 user.create.error_creating_account=Error creating the user account. Please check your error logs.
@@ -970,7 +1032,8 @@ user.create.pwd=Password
 user.create.confirm_pwd=Confirm Password
 user.create.requied=Required fields
 
-#user delete Page
+# User delete Page
+
 user.delete.title=Delete User
 user.delete.info=Are you sure you want to delete the user
 user.delete.info1=from the system?
@@ -978,7 +1041,8 @@ user.delete.warning=Warning! You are about to delete your
 user.delete.warning2=own
 user.delete.warning3=user account. Are you sure you want to do this? Doing so will log you out of the system immediately.
 
-#user edit form Page
+# User edit form Page
+
 user.edit.form.title=Edit User
 user.edit.form.update=User edited successfully.
 user.edit.form.info=Use the form below to edit user properties.
@@ -986,7 +1050,8 @@ user.edit.form.property=User Properties
 user.edit.form.enter_name=Please enter a valid name.
 user.edit.form.enter_mail=Please enter a valid email address.
 
-#user message Page
+# User message Page
+
 user.message.title=Send Administrative Message
 user.message.send=Message sent successfully.
 user.message.send_admin_msg=Send Administrative Message
@@ -999,7 +1064,8 @@ user.message.valid_address=Please choose a valid address.
 user.message.message=Message
 user.message.valid_message=Please enter a valid message.
 
-#user password Page
+# User password Page
+
 user.password.title=Change Password
 user.password.error_set_pwd=Error setting the password. Please make sure the password you enter is valid and matches the confirmation password.
 user.password.update=Password updated successfully.
@@ -1008,7 +1074,8 @@ user.password.change=Change Password
 user.password.new_pwd=New Password
 user.password.confirm_new_pwd=Confirm New Password
 
-#user properties Page
+# User properties Page
+
 user.properties.title=User Properties
 user.properties.info=Below is a summary of user properties. To edit properties, click the "Edit" button below.
 user.properties.created=New user created successfully.
@@ -1018,12 +1085,14 @@ user.properties.offline=Offline
 user.properties.not_set=Not set.
 user.properties.registered=Registered
 
-#user search Page
+# User search Page
+
 user.search.title=User Search
 user.search.not_found=User not found. Please try a different search.
 user.search.search_user=Search For User
 
-#User Summary Page
+# User Summary Page
+
 User.Summary.title=User Summary
 User.Summary.info=Below is a list of users in the system.
 User.Summary.deleted=User deleted successfully.
@@ -1038,7 +1107,8 @@ User.Summary.not_user=No users in the system.
 User.Summary.click_edit=Click to edit...
 User.Summary.click_delete=Click to delete...
 
-#user tabs Page
+# User tabs Page
+
 user.tabs.properties=User Properties
 user.tabs.edit=Edit User
 user.tabs.send=Send Message

src/i18n/messenger_i18n_zh_CN.properties

@@ -2,35 +2,102 @@
 # $Revision$
 # $Date$
 
-# This resource bundle file is the default resource bundle that will be
-# used by Jive if a resource bundle for a specific Locale cannot be found.
-#
-# Additional locales can be specified by creating a new resource file in this
-# directory using the following conventions:
-#
-#   jive_i18n "_" language "_" country ".properties"
-#   jive_i18n "_" language ".properties"
-#
-# e.g.
-#    jive_i18n_en.propertis       <- English resources
-#    jive_i18n_en_US.properties   <- American US resources
-#    jive_i18n_de.properties      <- German resources
-#    jive_i18n_ja.properties      <- Japanese resources
-#
-# Please note that the two digit language code should be lower case, and the
-# two digit country code should be in uppercase. Often, it is not necessary to
-# specify the country code.
-#
-# A full list of language codes can be found at
-# http://www-old.ics.uci.edu/pub/ietf/http/related/iso639.txt
-# and a full list of country codes can be found at
-# http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html
-#
-# In property strings that are parameterized, single quotes can be used to
-# quote the "{" (curly brace) if necessary. A real single quote is represented by ''.
-#
-# REVISION HISTORY (by Jive Messenger version):
-#
+##
+## Jive Messenger Resource Bundle - Chinese locale (zh_CN)
+##
+## For a full changelog, refer to the English bundle, messenger_i18n_en.properties.
+##
+
+# Messenger
+
+short.title = Jive Messenger
+title = Jive Messenger
+
+# Sidebar, tabs (preserve the indenting below -- helps to visualize the structure:
+
+tab.server=Server
+tab.server.descr=Click to manage server settings
+    sidebar.server-manager=Server Manager
+        sidebar.server-settings=Server Settings
+        sidebar.server-settings.descr=Click to manage system settings
+        sidebar.system-props=System Properties
+        sidebar.system-props.descr=Click to manage server properties
+        sidebar.server-locale=System Locale
+        sidebar.server-locale.descr=Click to set the locale used by the system
+        sidebar.server-db=Database
+        sidebar.server-db.descr=Database
+        sidebar.server-logs=Logs
+        sidebar.server-logs.descr=Click to view server logs
+    sidebar.sidebar-server-settings=Server Settings
+        sidebar.server-reg-and-login=Registration &amp; Login
+        sidebar.server-reg-and-login.descr=Click to edit registration &amp; login policies
+        sidebar.server-session-conflict=Resource Policy
+        sidebar.server-session-conflict.descr=
+        sidebar.server-offline-messages=Offline Messages
+        sidebar.server-offline-messages.descr=
+        sidebar.server-audit-policy=Message Audit Policy
+        sidebar.server-audit-policy.descr=
+        sidebar.server-data-settings=Private Data Storage
+        sidebar.server-data-settings.descr=
+        sidebar.server-ssl=SSL Settings
+        sidebar.server-ssl.descr=
+tab.tab-users=Users/Groups
+tab.tab-users.descr=Click to manage users and groups
+    sidebar.sidebar-users=Users
+        sidebar.user-summary=User Summary
+        sidebar.user-summary.descr=Click to see a list of users in the system
+            sidebar.sidebar-users-options=User Options
+                sidebar.user-properties=User Properties
+                sidebar.user-properties.descr=Click to edit the user's properties
+                sidebar.user-password=Password
+                sidebar.user-password.descr=Click to change the user's password
+                sidebar.user-delete=Delete User
+                sidebar.user-delete.descr=Click to delete the user
+        sidebar.user-create=Create New User
+        sidebar.user-create.descr=Click to add a new user to the system
+        sidebar.user-search=User Search
+        sidebar.user-search.descr=Click to search for a particular user
+    sidebar.sidebar-groups=Groups
+        sidebar.group-summary=Group Summary
+        sidebar.group-summary.descr=Click to see a list of groups in the system
+            sidebar.sidebar-group-options=Group Options
+                sidebar.group-edit=Edit Group
+                sidebar.group-edit.descr=Click to edit the group
+                sidebar.group-delete=Delete Group
+                sidebar.group-delete.descr=Click to delete the group
+        sidebar.group-create=Create New Group
+        sidebar.group-create.descr=Click to add a new group to the system
+tab.tab-session=Sessions
+tab.tab-session.descr=Click to manage connected sessions
+    sidebar.session-summary=View Current Sessions
+    sidebar.session-summary.descr=Click to manage XMPP sessions
+    sidebar.user-message=Send Message
+    sidebar.user-message.descr=Click to send a message
+tab.tab-groupchat=Group Chat
+tab.tab-groupchat.descr=Click to manage group chat setting
+    sidebar.sidebar-groupchat-settings=Group Chat Settings
+        sidebar.muc-server-props=Service Properties
+        sidebar.muc-server-props.descr=
+        sidebar.muc-history=History Settings
+        sidebar.muc-history.descr=
+        sidebar.muc-sysadmin=Administrators
+        sidebar.muc-sysadmin.descr=
+        sidebar.muc-perms=Room Creation Permissions
+        sidebar.muc-perms.descr=
+        sidebar.muc-tasks=Other Settings
+        sidebar.muc-tasks.descr=
+    sidebar.sidebar-groupchat-administration=Room Administration
+        sidebar.muc-room-summary=Room Summary
+        sidebar.muc-room-summary.descr=Click to see a list of rooms in the service
+            sidebar.sidebar-groupchat-options=Room Options
+                sidebar.muc-room-edit-form=Room Settings
+                sidebar.muc-room-edit-form.descr=Click to edit the room's configuration
+                sidebar.muc-room-affiliations=User Permissions
+                sidebar.muc-room-affiliations.descr=Click to edit user permissions
+                sidebar.muc-room-delete=Delete Room
+                sidebar.muc-room-delete.descr=Click to delete the room
+        sidebar.muc-room-create=Create New Room
+        sidebar.muc-room-create.descr=Click to add a new room to the service
 
 # Server startup messages
 # NLS_MESSAGEFORMAT_NONE
@@ -73,7 +140,7 @@ admin.authenticated={0} \u5df2\u5728\u8fde\u63a5 {1} \u4e0a\u901a\u8fc7\u8ba4\u8
 admin.warn.license=\u5df2\u8d85\u51fa\u8bb8\u53ef\u8bc1\u9650\u5236\uff0c\u62d2\u7edd\u7528\u6237\u8fde\u63a5
 admin.error.license=\u65e0\u6cd5\u8bb8\u53ef\u63d2\u4ef6 {0}
 
-# Server messages (too users)
+# Server messages (to users)
 user.license=\u8bf7\u7a0d\u5019\u518d\u5c1d\u8bd5\u767b\u5f55\uff0c\u6216\u8054\u7cfb\u60a8\u7684\u7cfb\u7edf\u7ba1\u7406\u5458
 user.license.title=\u767b\u5f55\u7684\u7528\u6237\u8fc7\u591a
 
@@ -110,11 +177,13 @@ muc.locked=\u8be5\u623f\u95f4\u73b0\u5728\u5df2\u4e0a\u9501\u3002
 muc.unlocked=\u8be5\u623f\u95f4\u73b0\u5728\u5df2\u89e3\u9501\u3002
 muc.warnnonanonymous=\u8be5\u623f\u95f4\u4e0d\u662f\u533f\u540d\u7684\u3002
 muc.roomIsNowMembersOnly=\u8be5\u623f\u95f4\u73b0\u5728\u4ec5\u5bf9\u6210\u5458\u5f00\u653e\u3002
+
 # Labels for extended info (dataform) returned for disco#info requests
 muc.extended.info.desc=\u63cf\u8ff0
 muc.extended.info.subject=\u4e3b\u9898
 muc.extended.info.occupants=\u5360\u6709\u8005\u4eba\u6570
 muc.extended.info.creationdate=\u521b\u5efa\u65e5\u671f
+
 # Labels for room registration data form
 muc.form.reg.title=\u5df2\u5411\u8be5\u623f\u95f4\u6ce8\u518c
 muc.form.reg.instruction=\u4e3a\u5411\u8be5\u623f\u95f4\u6ce8\u518c\uff0c\u8bf7\u63d0\u4f9b\u4ee5\u4e0b\u4fe1\u606f\u3002
@@ -124,11 +193,12 @@ muc.form.reg.nickname=\u6635\u79f0
 muc.form.reg.url=\u60a8\u7684 URL
 muc.form.reg.email=\u7535\u5b50\u90ae\u4ef6\u5730\u5740
 muc.form.reg.faqentry=FAQ \u9879
+
 # Labels for room configuration data form
 muc.form.conf.title=\u623f\u95f4\u914d\u7f6e
 muc.form.conf.instruction=\u5df2\u521b\u5efa\u623f\u95f4\u201c{0}\u201d\u3002\
-\u8981\u63a5\u53d7\u7f3a\u7701\u914d\u7f6e\uff0c\u8bf7\u5355\u51fb\u201c\u786e\u5b9a\u201d\u6309\u94ae\u3002\
-\u6216\u586b\u5199\u4ee5\u4e0b\u8868\u5355\u4ee5\u5b8c\u6210\u8bbe\u7f6e\uff1a
+        \u8981\u63a5\u53d7\u7f3a\u7701\u914d\u7f6e\uff0c\u8bf7\u5355\u51fb\u201c\u786e\u5b9a\u201d\u6309\u94ae\u3002\
+        \u6216\u586b\u5199\u4ee5\u4e0b\u8868\u5355\u4ee5\u5b8c\u6210\u8bbe\u7f6e\uff1a
 muc.form.conf.owner_roomname=\u623f\u95f4\u540d\u79f0
 muc.form.conf.owner_roomdesc=\u63cf\u8ff0
 muc.form.conf.owner_changesubject=\u5141\u8bb8\u5360\u6709\u8005\u66f4\u6539\u4e3b\u9898
@@ -151,16 +221,12 @@ muc.form.conf.owner_whois=\u80fd\u591f\u53d1\u73b0\u5360\u6709\u8005\u771f\u5b9e
 muc.form.conf.anyone=\u4efb\u4f55\u4eba
 muc.form.conf.owner_enablelogging=\u767b\u5f55\u623f\u95f4\u5bf9\u8bdd
 muc.form.conf.roomadminsfixed=\u60a8\u53ef\u4ee5\u6307\u5b9a\u8be5\u623f\u95f4\u7684\u7ba1\u7406\u5458\u3002\
-\u8bf7\u5728\u6bcf\u884c\u63d0\u4f9b\u4e00\u4e2a JID\u3002
+        \u8bf7\u5728\u6bcf\u884c\u63d0\u4f9b\u4e00\u4e2a JID\u3002
 muc.form.conf.owner_roomadmins=\u623f\u95f4\u7ba1\u7406\u5458
 muc.form.conf.roomownersfixed=\u60a8\u53ef\u4ee5\u6307\u5b9a\u8be5\u623f\u95f4\u7684\u5176\u4ed6\u62e5\u6709\u8005\u3002\
-\u8bf7\u5728\u6bcf\u884c\u63d0\u4f9b\u4e00\u4e2a JID\u3002
+        \u8bf7\u5728\u6bcf\u884c\u63d0\u4f9b\u4e00\u4e2a JID\u3002
 muc.form.conf.owner_roomowners=\u623f\u95f4\u62e5\u6709\u8005
 
-# Messenger 
-short.title = Jive Messenger
-title = Jive Messenger
-
 # Admin Console Pages below
 global.restart=\u91cd\u65b0\u542f\u52a8
 global.server_status=\u670d\u52a1\u5668\u72b6\u6001
@@ -239,9 +305,8 @@ chatroom.history.settings.label_show_message_number_content=\u663e\u793a\u804a\u
 
 #error Page
 error.admin_privileges=\u60a8\u6ca1\u6709\u6267\u884c\u8be5\u64cd\u4f5c\u6240\u9700\u7684\u7ba1\u7406\u6743\u9650\u3002
-error.requested_user=\u8bf7\u6c42\u7684\u7528\u6237
-error.username=\uff08\u7528\u6237\u540d\uff1a
-error.not_found=\u672a\u627e\u5230\u3002
+error.requested_user_not_found=The requested user was not found.
+error.specific_user_not_found=The requested user ({0}) was not found.
 error.not_found_group=\u672a\u627e\u5230\u8bf7\u6c42\u7684\u7ec4\u3002
 error.exception=\u5f02\u5e38\uff1a
 
@@ -322,7 +387,6 @@ group.summary.no_groups=\u7cfb\u7edf\u4e2d\u6ca1\u6709\u5b9a\u4e49\u7ec4\u3002
 group.summary.click_edit=\u201c\u5355\u51fb\u53ef\u7f16\u8f91...\u201d
 group.summary.click_delete=\u201c\u5355\u51fb\u53ef\u5220\u9664...\u201d
 
-
 #header Page
 header.admin=\u7ba1\u7406\u5458
 
@@ -345,7 +409,6 @@ index.app=Appserver:
 index.os=OS\uff0f\u786c\u4ef6\uff1a
 index.local=\u8bed\u8a00\u73af\u5883\uff0f\u65f6\u533a\uff1a
 
-
 #license details Page
 license.details.info=\u4ee5\u4e0b\u662f\u60a8\u7684
 license.details.info1=\u8bb8\u53ef\u8bc1\u6458\u8981\u3002
@@ -830,7 +893,6 @@ setup.index.not_write_permission=\u8bbe\u7f6e\u7a0b\u5e8f\u80fd\u591f\u627e\u523
 setup.pause.title=\u8bf7\u91cd\u65b0\u542f\u52a8\u60a8\u7684\u670d\u52a1\u5668\u5e76\u5173\u95ed\u672c\u7a97\u53e3\u3002\u4f7f\u7528\u542f\u52a8\u7a0b\u5e8f\u542f\u52a8\u7ba1\u7406\u63a7\u5236\u53f0\uff0c\u6216\u4f5c\u4e3a\u670d\u52a1\u542f\u52a8\u4ee5\u8fdb\u5165\u7ba1\u7406\u5de5\u5177\u3002
 setup.pause.close=\u5173\u95ed\u7a97\u53e3
 
-
 #setup sidebar Page
 setup.sidebar.title=\u5b89\u88c5\u8fdb\u5ea6
 
@@ -861,7 +923,6 @@ ssl.settings.client=\u5ba2\u6237\u673a\u8bc1\u4e66
 ssl.settings.a_certificate=\u8bc1\u4e66
 ssl.settings.paste_certificate=\u7c98\u8d34 CA \u53d1\u9001\u7ed9\u60a8\u7684\u8bc1\u4e66\u6216\u7531 keytool \u751f\u6210\u7684\u81ea\u7b7e\u7f72\u8bc1\u4e66\u3002
 
-
 #user create Page
 user.create.title=\u521b\u5efa\u7528\u6237
 user.create.info=\u8bf7\u4f7f\u7528\u4e0b\u9762\u7684\u8868\u5355\u65b0\u5efa\u7528\u6237\u3002