Skip to content

O
Openfire
Commit e471412f authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

i18n fixes. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5494 b35dd754-fafc-0310-a699-88a17e54d16e
parent 426ae23f
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 21 deletions
src/i18n/wildfire_i18n_en.properties
View file @ e471412f
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
## Updated key: 'user.properties.info' ## Updated key: 'user.properties.info'
## Added key: 'session.details.priority' ## Added key: 'session.details.priority'
## Added section: 'setup.ldap.*' ## Added section: 'setup.ldap.*'
## Added section: 'setup.profile.*'
## Added key: 'muc.service-name' ## Added key: 'muc.service-name'
## Updated section: 'group.edit.*' ## Updated section: 'group.edit.*'
## Updated key: 'group.create.form' (note, old translations left in place and need updates) ## Updated key: 'group.create.form' (note, old translations left in place and need updates)
...@@ -1328,6 +1329,17 @@ setup.datasource.standard.timeout_info=The time (in days) before connections in ...@@ -1328,6 +1329,17 @@ setup.datasource.standard.timeout_info=The time (in days) before connections in
pool are recycled. pool are recycled.
setup.datasource.standard.note=Note, it might take between 30-60 seconds to connect to your database. setup.datasource.standard.note=Note, it might take between 30-60 seconds to connect to your database.
# Profile settings page
setup.profile.title=Profile Settings
setup.profile.description=Choose the user and group system to use with Wildfire.
setup.profile.default=Default
setup.profile.default_description=Store users and groups in the Wildfire database. This is the \
best option for simple deployments.
setup.profile.ldap=Directory Server (LDAP)
setup.profile.ldap_description=Integrate with a directory server such as Active Directory or \
OpenLDAP using the LDAP protocol. Users and groups are stored in the directory and treated \
as read-only.
# Setup LDAP pages # Setup LDAP pages
setup.ldap.title=Profile Settings setup.ldap.title=Profile Settings
......
src/web/setup/setup-profile-settings.jsp
View file @ e471412f
...@@ -4,15 +4,7 @@ ...@@ -4,15 +4,7 @@
- $Date: 2005-05-26 23:00:40 -0700 (Thu, 26 May 2005) $ - $Date: 2005-05-26 23:00:40 -0700 (Thu, 26 May 2005) $
--%> --%>
<%@ page import="org.jivesoftware.util.*,
java.util.HashMap,
java.util.Map,
java.util.Date,
org.jivesoftware.wildfire.user.User,
org.jivesoftware.wildfire.user.UserManager,
org.jivesoftware.util.JiveGlobals" %>
<%@ page import="org.jivesoftware.wildfire.XMPPServer"%> <%@ page import="org.jivesoftware.wildfire.XMPPServer"%>
<%@ page import="org.jivesoftware.wildfire.auth.AuthFactory"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %> <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
...@@ -45,17 +37,17 @@ ...@@ -45,17 +37,17 @@
%> %>
<html> <html>
<head> <head>
<title>Profile Settings</title> <title><fmt:message key="setup.profile.title" /></title>
<meta name="currentStep" content="3"/> <meta name="currentStep" content="3"/>
</head> </head>
<body> <body>
<h1> <h1>
Profile Settings <fmt:message key="setup.profile.title" />
</h1> </h1>
<p> <p>
Choose the user and group system to use with Wildfire. <fmt:message key="setup.profile.description" />
</p> </p>
<!-- BEGIN jive-contentBox --> <!-- BEGIN jive-contentBox -->
...@@ -68,9 +60,8 @@ ...@@ -68,9 +60,8 @@
<input type="radio" name="mode" value="default" id="rb01" checked> <input type="radio" name="mode" value="default" id="rb01" checked>
</td> </td>
<td> <td>
<label for="rb01"><b>Default</b></label><br> <label for="rb01"><b><fmt:message key="setup.profile.default" /></b></label><br>
Store users and groups in the Wildfire database. This is the best option for simple <fmt:message key="setup.profile.default_description" />
deployments.
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -78,15 +69,13 @@ ...@@ -78,15 +69,13 @@
<input type="radio" name="mode" value="ldap" id="rb02"> <input type="radio" name="mode" value="ldap" id="rb02">
</td> </td>
<td> <td>
<label for="rb02"><b>Directory Server (LDAP)</b></label><br> <label for="rb02"><b><fmt:message key="setup.profile.ldap" /></b></label><br>
Integrate with a directory server such as Active Directory or OpenLDAP using the <fmt:message key="setup.profile.ldap_description" />
LDAP protocol. Users and groups are stored in the directory and treated as read-only.
</td> </td>
</tr> </tr>
</table> </table>
<br> <br>
<div align="right"> <div align="right">
<input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0"> <input type="Submit" name="continue" value="<fmt:message key="global.continue" />" id="jive-setup-save" border="0">
</div> </div>
...@@ -95,7 +84,5 @@ ...@@ -95,7 +84,5 @@
</div> </div>
<!-- END jive-contentBox --> <!-- END jive-contentBox -->
</body> </body>
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023