some changes for better translation

lam/help/help.inc

@@ -36,64 +36,79 @@ $helpArray = array (
 				// configuration wizard
 				// configuration login
 				"200" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Login"),
-					"Text" => _("Please enter the configuration password. This is NOT your LDAP password.".
+					"Text" => _("Please enter the configuration password. This is NOT your LDAP password. It is stored in your .conf-file. If this is the first time you log in, enter 'lam'.")),
-						" It is stored in lam.conf. If this is the first time you log in, enter \"lam\".")),
 				"201" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Server Address"),
-					"Text" => _("This is the Server Address of your LDAP server. Use ldap:// for standard LDAP connections".
+					"Text" => _("This is the Server Address of your LDAP server. Use ldap:// for standard LDAP connections and ldaps:// for encrypted (require server certificates) connections. The port value is optional.") .
-						" and ldaps:// for encrypted (require server certificates) connections. The port value is optional.<br><br>".
+						"<br><br><b> " .
-						"<b>Examples:</b><br><br> ldap://localhost:389 connects to localhost using a standard LDAP connection on port 389<br>".
+						_("Examples") .
-						"ldaps://141.40.146.133 connects to 141.40.146.133 using an encrypted LDAP connection.<br><br>".
+						":</b><br><br> " .
-						"<br><b>Note:</b><br><br>When using ldaps:// be sure to use exactly the same IP/domain name as in your certificate!")),
+						_("ldap://localhost:389 connects to localhost using a standard LDAP connection on port 389") .
+						"<br> " .
+						_("ldaps://141.40.146.133 connects to 141.40.146.133 using an encrypted LDAP connection.") .
+						"<br><br><br><b> " .
+						_("Note") .
+						":</b><br><br>" .
+						_("When using ldaps:// be sure to use exactly the same IP/domain name as in your certificate!")),
 				"202" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - User/Group/Host suffix"),
-					"Text" => _("This is the suffix of the LDAP tree from where to search for user/group/host entries.".
+					"Text" => _("This is the suffix of the LDAP tree from where to search for user/group/host entries. Only entries in these subtrees will be displayed in the user/group/host list. When creating a new accont this will be the DN where it is saved.") .
-						" Only entries in these subtrees will be displayed in the user/group/host list. When creating a".
+						"<br><br><b>".
-						" new accont this will be the DN where it is saved.<br><br><b>Examples:</b><br><br>ou=People,dc=yourcompany,dc=com".
+						_("Examples").
-						" will read and store all accounts in this subtree.")),
+						":</b><br><br>".
+						_("ou=People,dc=yourcompany,dc=com will read and store all accounts in this subtree.")),
 				"203" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - UID Number"),
-					"Text" => _("These are the minimum and maximum numbers to use for user IDs when creating new user accounts.".
+					"Text" => _("These are the minimum and maximum numbers to use for user IDs when creating new user accounts. The range has to be different from that of machines. New user accounts will always get the highest number in use plus one.")),
-						"The range has to be different from that of machines. New user accounts will always get the highest number in use plus one.")),
 				"204" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - GID Number"),
-					"Text" => _("These are the minimum and maximum numbers to use for group IDs when creating new group accounts.".
+					"Text" => _("These are the minimum and maximum numbers to use for group IDs when creating new group accounts. New group accounts will always get the highest number in use plus one.")),
-						"New group accounts will always get the highest number in use plus one.")),
 				"205" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Machine Number"),
-					"Text" => _("These are the minimum and maximum numbers to use for machine IDs when creating new accounts for Samba hosts.".
+					"Text" => _("These are the minimum and maximum numbers to use for machine IDs when creating new accounts for Samba hosts. The range has to be different from that of users. New host accounts will always get the highest number in use plus one.")),
-						"The range has to be different from that of users. New host accounts will always get the highest number in use plus one.")),
 				"206" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - List Attributes"),
-					"Text" => _("This is the list of attributes to show in the user/group/host list.".
+					"Text" => _("This is the list of attributes to show in the user/group/host list. The entries can either be predefined values, '#value', or individual ones, 'value:description'. Several entries are seperated by semicolons.") .
-						" The entries can either be predefined values, \"#value\", or individual ones, \"value:description\".".
+						"<br><br><b>" .
-						"Several entries are seperated by semicolons.<br><br>".
+						_("Example") .
-						"<b>Example: </b>#homeDirectory;#uid;#cn;#uidNumber;#gidNumber;description:UserDescription<br><br> ".
+						": </b>#homeDirectory;#uid;#cn;#uidNumber;#gidNumber;description:UserDescription<br><br><br><u><b>" .
-						"<br><u><b>Predefined values:</b></u><br>".
+						_("Predefined values") .
-						"<br><b>Users: </b>#uid, #uidNumber, #gidNumber, #cn, #host, #givenName, #sn, #homeDirectory, #loginShell, #mail, #gecos".
+						":</b></u><br><br><b>" .
-						"<br><b>Groups: </b>#cn, #gidNumber, #memberUID, #member, #description".
+						_("Users") .
-						"<br><b>Groups: </b>#uid, #cn, #rid, #description")),
+						": </b>#uid, #uidNumber, #gidNumber, #cn, #host, #givenName, #sn, #homeDirectory, #loginShell, #mail, #gecos".
+						"<br><b>" .
+						_("Groups") .
+						": </b>#cn, #gidNumber, #memberUID, #member, #description".
+						"<br><b>" .
+						_("Hosts") .
+						": </b>#uid, #cn, #rid, #description"),
 				"207" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Valid Users"),
-					"Text" => _("This is a list of valid DN entries of all users that are allowed to login to LDAP Account Manager.".
+					"Text" => _("This is a list of valid DN entries of all users that are allowed to login to LDAP Account Manager. The user names have to be separated by semicolons.") .
-						"The user names have to be separated by semicolons.<br><br>".
+						"<br><br><b>" .
-						"<b>Example: </b>cn=admin,dc=yourdomain,dc=org;cn=manager,dc=yourdomain,dc=org")),
+						_("Example") .
+						": </b>cn=admin,dc=yourdomain,dc=org;cn=manager,dc=yourdomain,dc=org"),
 				"208" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Maximum List Entries"),
-					"Text" => _("This is the number of rows to show in the user/group/host list. If more entries are found the list".
+					"Text" => _("This is the number of rows to show in the user/group/host list. If more entries are found the list will be split to several pages.")),
-					" will be split to several pages.")),
 				"209" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Default Language"),
-					"Text" => _("Defines the language of the login window and is sets this language the default language.".
+					"Text" => _("Defines the language of the login window and is sets this language the default language. Users can change the language at login.")),
-					" Users can change the language at login.")),
 				"210" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Script Path"),
-					"Text" => _("This is the absolute path to an external script for setting quotas and creating home directories.".
+					"Text" => _("This is the absolute path to an external script for setting quotas and creating home directories.").
-						"<br><br><b>Use it at your own risk and read the documentation for lamdaemon before you use it!</b>"),
+							"<br><br><b>".
+							_("Use it at your own risk and read the documentation for lamdaemon before you use it!").
+							"</b>",
 					"SeeAlso" => "<a href=\"./help.php?HelpNumber=210\" target=\"_self\">TODO link to lamdaemon doku</a>"),
 				"211" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Script Server"),
-					"Text" => _("This is the server where the lamdaemon script is stored. LDAP Account Manager will make a SSH connection".
+					"Text" => _("This is the server where the lamdaemon script is stored. LDAP Account Manager will make a SSH connection to this server with username and password provided at login.").
-						" to this server with username and password provided at login.".
+						"<br><br><b>".
-						"<br><br><b>Use it at your own risk and read the documentation for lamdaemon before you use it!</b>"),
+						_("Use it at your own risk and read the documentation for lamdaemon before you use it!").
+						"</b>",
 					"SeeAlso" => "<a href=\"./help.php?HelpNumber=210\" target=\"_self\">TODO link to lamdaemon doku</a>"),
 				"212" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Change Password"),
 					"Text" => _("If you want to change the current preferences password, please enter it here.")),
 				"213" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Samba version"),
-					"Text" => _("If you use Samba 3.x with the new LDAP schema say \"yes\" here, otherwise \"no\".".
+					"Text" => _("If you use Samba 3.x with the new LDAP schema say 'yes' here, otherwise 'no'.").
-						"<br><br><b>LAM will not work if version is wrong!</b>")),
+						"<br><br><b>".
+						_("LAM will not work if version is wrong!").
+						"</b>"),
 				"214" => array ("ext" => "FALSE", "Headline" => _("Configuration Wizard - Samba domain SID"),
-					"Text" => _("If you use the new Samba 3.x schema enter your domain SID here.".
+					"Text" => _("If you use the new Samba 3.x schema enter your domain SID here.").
-						"<br><br>You can get your domain SID with this command: <b>net getlocalsid</b>")),
+						"<br><br>".
+						_("You can get your domain SID with this command: ").
+					"<b>'net getlocalsid'</b>"),
 				// 300 - 399
 				// Roland Gruber
 				// profile editor