summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--edit_privacy.php6
-rw-r--r--editconfig_gedcom.php8
-rw-r--r--help_text.php2
-rw-r--r--includes/classes/class_menubar.php6
-rw-r--r--includes/functions/functions_mediadb.php2
-rw-r--r--media.php4
-rw-r--r--placelist.php2
-rw-r--r--timeline.php2
-rw-r--r--uploadmedia.php4
-rw-r--r--useradmin.php12
10 files changed, 24 insertions, 24 deletions
diff --git a/edit_privacy.php b/edit_privacy.php
index b801848a63..80e74a9c52 100644
--- a/edit_privacy.php
+++ b/edit_privacy.php
@@ -346,7 +346,7 @@ if ($action=="update") {
<tr>
<td class="descriptionbox wrap">
- <?php echo i18n::translate('Use GEDCOM (RESN) Privacy restriction'), help_link('PRIVACY_BY_RESN'); ?>
+ <?php echo i18n::translate('Use GEDCOM (RESN) privacy restriction'), help_link('PRIVACY_BY_RESN'); ?>
</td>
<td class="optionbox">
<select size="1" name="v_PRIVACY_BY_RESN"><?php write_yes_no($PRIVACY_BY_RESN); ?></select>
@@ -493,8 +493,8 @@ if ($action=="update") {
<table class="facts_table">
<tr>
<td class="topbottombar <?php print $TEXT_DIRECTION; ?>">
- <?php print "<a href=\"javascript: ".i18n::translate('User Privacy settings')."\" onclick=\"expand_layer('user-privacy-options');return false\"><img id=\"user-privacy-options_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" /></a> "; ?>
- <a href="javascript: <?php print i18n::translate('User Privacy settings'); ?>" onclick="expand_layer('user-privacy-options');return false"><b><?php echo i18n::translate('User Privacy settings'); ?></b></a><?php echo help_link('user_privacy'); ?>
+ <?php print "<a href=\"javascript: ".i18n::translate('User privacy settings')."\" onclick=\"expand_layer('user-privacy-options');return false\"><img id=\"user-privacy-options_img\" src=\"".$WT_IMAGE_DIR."/".$WT_IMAGES["plus"]["other"]."\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" /></a> "; ?>
+ <a href="javascript: <?php print i18n::translate('User privacy settings'); ?>" onclick="expand_layer('user-privacy-options');return false"><b><?php echo i18n::translate('User privacy settings'); ?></b></a><?php echo help_link('user_privacy'); ?>
</td>
</tr>
</table>
diff --git a/editconfig_gedcom.php b/editconfig_gedcom.php
index 4a5985e12b..b953d9ad7b 100644
--- a/editconfig_gedcom.php
+++ b/editconfig_gedcom.php
@@ -695,7 +695,7 @@ print_header(i18n::translate('GEDCOM Configuration'));
</tr>
<tr>
<td class="descriptionbox wrap width20">
- <?php echo i18n::translate('Use Media Viewer'), help_link('USE_MEDIA_VIEWER'); ?>
+ <?php echo i18n::translate('Use media viewer'), help_link('USE_MEDIA_VIEWER'); ?>
</td>
<td class="optionbox">
<?php echo edit_field_yes_no('NEW_USE_MEDIA_VIEWER', $USE_MEDIA_VIEWER, 'tabindex="'.(++$i).'"'); ?>
@@ -724,7 +724,7 @@ print_header(i18n::translate('GEDCOM Configuration'));
</tr>
<tr>
<td class="descriptionbox wrap width20">
- <?php echo i18n::translate('Use Media Firewall'), help_link('USE_MEDIA_FIREWALL'); ?>
+ <?php echo i18n::translate('Use media firewall'), help_link('USE_MEDIA_FIREWALL'); ?>
</td>
<td class="optionbox">
<?php echo edit_field_yes_no('NEW_USE_MEDIA_FIREWALL', $USE_MEDIA_FIREWALL, 'tabindex="'.(++$i).'"'); ?>
@@ -812,7 +812,7 @@ print_header(i18n::translate('GEDCOM Configuration'));
</tr>
<tr>
<td class="descriptionbox wrap width20">
- <?php echo i18n::translate('Welcome text on Login page'), help_link('WELCOME_TEXT_AUTH_MODE'); ?>
+ <?php echo i18n::translate('Welcome text on login page'), help_link('WELCOME_TEXT_AUTH_MODE'); ?>
</td>
<td class="optionbox"><select name="NEW_WELCOME_TEXT_AUTH_MODE" tabindex="<?php echo ++$i; ?>">
<option value="0" <?php if ($WELCOME_TEXT_AUTH_MODE=='0') print "selected=\"selected\""; ?>><?php print i18n::translate('No predefined text'); ?></option>
@@ -1075,7 +1075,7 @@ print_header(i18n::translate('GEDCOM Configuration'));
<table class="facts_table">
<tr>
<td class="descriptionbox wrap width20">
- <?php echo i18n::translate('Upcoming Events block day limit'), help_link('DAYS_TO_SHOW_LIMIT'); ?>
+ <?php echo i18n::translate('Upcoming events block day limit'), help_link('DAYS_TO_SHOW_LIMIT'); ?>
</td>
<td class="optionbox"><input type="text" name="NEW_DAYS_TO_SHOW_LIMIT" value="<?php print $DAYS_TO_SHOW_LIMIT; ?>" size="2" tabindex="<?php echo ++$i; ?>" /></td>
</tr>
diff --git a/help_text.php b/help_text.php
index ed0202e5fd..557c8726c4 100644
--- a/help_text.php
+++ b/help_text.php
@@ -4074,7 +4074,7 @@ case 'help_contents_help':
.i18n::translate('FAQ List: Edit').'</a></li><li><a href="?help=add_gedcom">'.i18n::translate('GEDCOM: Add').'</li><li><a href="?help=add_upload_gedcom">'.i18n::translate('GEDCOM: Add vs Upload').'</a></li><li><a href="?help=edit_gedcoms">'.i18n::translate('GEDCOM: Administration page').'</a></li><li><a href="?help=change_indi2id">'
.i18n::translate('GEDCOM: Change Individual ID to ...').'</a></li><li><a href="?help=gedcom_configfile">'.i18n::translate('GEDCOM: Configuration file').'</a></li><li><a href="?help=edit_config_gedcom">'.i18n::translate('GEDCOM: Configure').'</a></li><li><a href="?help=add_new_gedcom">'.i18n::translate('GEDCOM: Create new').'</a></li><li><a href="?help=default_gedcom">'.i18n::translate('GEDCOM: Default').'</a></li><li><a href="?help=delete_gedcom">'.i18n::translate('GEDCOM: Delete').'</a></li><li><a href="?help=download_gedcom">'
.i18n::translate('GEDCOM: Download').'<a/></li><li><a href="?help=import_gedcom">'.i18n::translate('GEDCOM: Import').'</a></li><li><a href="?help=edit_privacy">'.i18n::translate('GEDCOM: Privacy settings').'</a></li><li><a href="?help=upload_gedcom">'.i18n::translate('GEDCOM: Upload').'</a></li><li><a href="?help=validate_gedcom">'
- .i18n::translate('GEDCOM: Validate').'</a></li><li><a href="?help=readmefile">'.i18n::translate('Readme file').'</a></li><li><a href="?help=help_useradmin.php">'.i18n::translate('User Administration').'</a></li></ul></td>';
+ .i18n::translate('GEDCOM: Validate').'</a></li><li><a href="?help=readmefile">'.i18n::translate('Readme file').'</a></li><li><a href="?help=help_useradmin.php">'.i18n::translate('User administration').'</a></li></ul></td>';
}
$text.=('</tr></table>');
break;
diff --git a/includes/classes/class_menubar.php b/includes/classes/class_menubar.php
index 77b1cc5e4c..329d8692da 100644
--- a/includes/classes/class_menubar.php
+++ b/includes/classes/class_menubar.php
@@ -179,7 +179,7 @@ class MenuBar
//-- upload_media submenu
if (is_writable($MEDIA_DIRECTORY) && $MULTI_MEDIA) {
$menu->addSeparator();
- $submenu = new Menu(i18n::translate('Upload Media files'), "uploadmedia.php");
+ $submenu = new Menu(i18n::translate('Upload media files'), "uploadmedia.php");
if (!empty($WT_IMAGES["menu_media"]["small"]))
$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["menu_media"]["small"]);
$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_menu_media");
@@ -242,7 +242,7 @@ class MenuBar
if (file_exists(WT_ROOT.'fanchart.php') && function_exists("imagettftext")) $menuList["fanchart"] = i18n::translate('Circle Diagram');
if (file_exists(WT_ROOT.'hourglass.php')) $menuList["hourglass"] = i18n::translate('Hourglass Chart');
if (file_exists(WT_ROOT.'familybook.php')) $menuList["familybook"] = i18n::translate('Family Book Chart');
- if (file_exists(WT_ROOT.'timeline.php')) $menuList["timeline"] = i18n::translate('Timeline Chart');
+ if (file_exists(WT_ROOT.'timeline.php')) $menuList["timeline"] = i18n::translate('Timeline chart');
if (file_exists(WT_ROOT.'lifespan.php')) $menuList["lifespan"] = i18n::translate('Lifespan Chart');
if (file_exists(WT_ROOT.'relationship.php')) $menuList["relationship"] = i18n::translate('Relationship Chart');
if (file_exists(WT_ROOT.'statistics.php')) $menuList["statistics"] = i18n::translate('Statistics');
@@ -336,7 +336,7 @@ class MenuBar
//-- timeline
$link = "timeline.php?ged=".WT_GEDCOM;
if ($rootid) $link .= "&amp;pids[]=".$rootid;
- $submenu = new Menu(i18n::translate('Timeline Chart'), $link);
+ $submenu = new Menu(i18n::translate('Timeline chart'), $link);
if (!empty($WT_IMAGES["timeline"]["small"]))
$submenu->addIcon($WT_IMAGE_DIR."/".$WT_IMAGES["timeline"]["small"]);
$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_timeline");
diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php
index e7bcf03c04..66b0537a35 100644
--- a/includes/functions/functions_mediadb.php
+++ b/includes/functions/functions_mediadb.php
@@ -1025,7 +1025,7 @@ function show_mediaUpload_form($URL='media.php', $showthumb=false) {
echo '<input type="hidden" name="showthumb" value="', $showthumb, '" />';
echo '<table class="list_table ', $TEXT_DIRECTION, ' width100">';
echo '<tr><td class="topbottombar" colspan="2">';
- echo i18n::translate('Upload Media files'), '<br />', i18n::translate('Maximum upload size: '), $filesize;
+ echo i18n::translate('Upload media files'), '<br />', i18n::translate('Maximum upload size: '), $filesize;
echo '</td></tr>';
$tab = 1;
// Print the Submit button for uploading the media
diff --git a/media.php b/media.php
index 60d690a3ff..87265ee045 100644
--- a/media.php
+++ b/media.php
@@ -780,8 +780,8 @@ if (check_media_structure()) {
</select></td>
<!-- // NOTE: Row 1 right, Upload media files -->
- <td class="descriptionbox wrap width25" <?php print $legendAlign;?>><?php echo i18n::translate('Upload Media files'), help_link('upload_media'); ?></td>
- <td class="optionbox wrap"><?php print "<a href=\"#\" onclick=\"expand_layer('uploadmedia');\">".i18n::translate('Upload Media files')."</a>"; ?></td></tr>
+ <td class="descriptionbox wrap width25" <?php print $legendAlign;?>><?php echo i18n::translate('Upload media files'), help_link('upload_media'); ?></td>
+ <td class="optionbox wrap"><?php print "<a href=\"#\" onclick=\"expand_layer('uploadmedia');\">".i18n::translate('Upload media files')."</a>"; ?></td></tr>
<!-- // NOTE: Row 2 left: Filter options -->
<tr><td class="descriptionbox wrap width25" <?php print $legendAlign;?>><?php echo i18n::translate('Filter'), help_link('simple_filter'); ?></td>
diff --git a/placelist.php b/placelist.php
index f9d0e42b03..f6a480d7b9 100644
--- a/placelist.php
+++ b/placelist.php
@@ -464,7 +464,7 @@ if ($display=="list") {
echo "\n\t\t</ul></td></tr>\n\t\t";
if ($i>1) {
echo "<tr><td>";
- if ($i>0) echo i18n::translate('Total Unique Places'), " ", $i;
+ if ($i>0) echo i18n::translate('Total unique places'), " ", $i;
echo "</td></tr>\n";
}
echo "\n\t\t</table>";
diff --git a/timeline.php b/timeline.php
index 042aaba021..65a2d4adb9 100644
--- a/timeline.php
+++ b/timeline.php
@@ -249,7 +249,7 @@ document.onmousemove = MM;
document.onmouseup = MU;
//-->
</script>
-<h2><?php echo i18n::translate('Timeline Chart'); ?></h2>
+<h2><?php echo i18n::translate('Timeline chart'); ?></h2>
<?php if (!$controller->isPrintPreview()) { ?><form name="people" action="timeline.php"><?php } ?>
<?php
$controller->checkPrivacy();
diff --git a/uploadmedia.php b/uploadmedia.php
index 43f25e80c0..c8179d63e2 100644
--- a/uploadmedia.php
+++ b/uploadmedia.php
@@ -52,7 +52,7 @@ if (!WT_USER_CAN_EDIT) {
exit;
}
-print_header(i18n::translate('Upload Media files'));
+print_header(i18n::translate('Upload media files'));
?>
<script language="JavaScript" type="text/javascript">
<!--
@@ -71,7 +71,7 @@ print_header(i18n::translate('Upload Media files'));
</script>
<center>
<?php
-print "<span class=\"subheaders\">".i18n::translate('Upload Media files')."</span><br /><br />";
+print "<span class=\"subheaders\">".i18n::translate('Upload media files')."</span><br /><br />";
$action = safe_POST('action');
if ($action == "upload") {
process_uploadMedia_form();
diff --git a/useradmin.php b/useradmin.php
index 00ee4458dc..a8e759f193 100644
--- a/useradmin.php
+++ b/useradmin.php
@@ -253,12 +253,12 @@ if ($action=="edituser") {
<?php $tab=0; ?>
<table class="center list_table width80 <?php echo $TEXT_DIRECTION; ?>">
<tr><td colspan="2" class="facts_label"><?php
- echo "<h2>", i18n::translate('Update User Account'), "</h2>";
+ echo "<h2>", i18n::translate('Update user account'), "</h2>";
?>
</td>
</tr>
<tr><td class="topbottombar" colspan="2">
- <input type="submit" tabindex="<?php echo ++$tab; ?>" value="<?php echo i18n::translate('Update User Account'); ?>" />
+ <input type="submit" tabindex="<?php echo ++$tab; ?>" value="<?php echo i18n::translate('Update user account'); ?>" />
<input type="button" tabindex="<?php echo ++$tab; ?>" value="<?php echo i18n::translate('Back'); ?>" onclick="window.location='<?php echo encode_url("useradmin.php?action=listusers&sort={$sort}&filter={$filter}&usrlang={$usrlang}"); ?>';"/>
</td></tr>
<tr>
@@ -372,7 +372,7 @@ if ($action=="edituser") {
<td class="optionbox wrap"><input type="text" name="new_max_relation_path" tabindex="<?php echo ++$tab; ?>" value="<?php echo get_user_setting($user_id, 'max_relation_path'); ?>" size="5" /></td></tr>
<tr><td class="descriptionbox wrap"><?php echo i18n::translate('Email Address'), help_link('useradmin_email'); ?></td><td class="optionbox wrap"><input type="text" name="emailaddress" tabindex="<?php echo ++$tab; ?>" dir="ltr" value="<?php echo getUserEmail($user_id); ?>" size="50" /></td></tr>
<tr><td class="descriptionbox wrap"><?php echo i18n::translate('User verified himself'), help_link('useradmin_verified'); ?></td><td class="optionbox wrap"><input type="checkbox" name="verified" tabindex="<?php echo ++$tab; ?>" value="yes" <?php if (get_user_setting($user_id, 'verified')=="yes") echo "checked=\"checked\""; ?> /></td></tr>
- <tr><td class="descriptionbox wrap"><?php echo i18n::translate('User approved by Admin'), help_link('useradmin_verbyadmin'); ?></td><td class="optionbox wrap"><input type="checkbox" name="verified_by_admin" tabindex="<?php echo ++$tab; ?>" value="yes" <?php if (get_user_setting($user_id, 'verified_by_admin')=="yes") echo "checked=\"checked\""; ?> /></td></tr>
+ <tr><td class="descriptionbox wrap"><?php echo i18n::translate('User approved by admin'), help_link('useradmin_verbyadmin'); ?></td><td class="optionbox wrap"><input type="checkbox" name="verified_by_admin" tabindex="<?php echo ++$tab; ?>" value="yes" <?php if (get_user_setting($user_id, 'verified_by_admin')=="yes") echo "checked=\"checked\""; ?> /></td></tr>
<tr><td class="descriptionbox wrap"><?php echo i18n::translate('Change language'), help_link('edituser_change_lang'); ?></td><td class="optionbox wrap" valign="top">
<?php
echo edit_field_language('user_language', get_user_setting($user_id, 'language'), 'tabindex="'.(++$tab).'"');
@@ -428,7 +428,7 @@ if ($action=="edituser") {
<td class="optionbox wrap"><input type="text" name="new_comment_exp" id="new_comment_exp" tabindex="<?php echo ++$tab; ?>" value="<?php echo get_user_setting($user_id, 'comment_exp'); ?>" />&nbsp;&nbsp;<?php print_calendar_popup("new_comment_exp"); ?></td>
</tr>
<tr><td class="topbottombar" colspan="2">
- <input type="submit" tabindex="<?php echo ++$tab; ?>" value="<?php echo i18n::translate('Update User Account'); ?>" />
+ <input type="submit" tabindex="<?php echo ++$tab; ?>" value="<?php echo i18n::translate('Update user account'); ?>" />
<input type="button" tabindex="<?php echo ++$tab; ?>" value="<?php echo i18n::translate('Back'); ?>" onclick="window.location='<?php echo encode_url("useradmin.php?action=listusers&sort={$sort}&filter={$filter}&usrlang={$usrlang}"); ?>';"/>
</td></tr>
</table>
@@ -532,7 +532,7 @@ if ($action == "listusers") {
<td class="descriptionbox wrap width10"><a href="<?php echo encode_url("useradmin.php?action=listusers&sort=sortreg&filter={$filter}&usrlang={$usrlang}&ged={$ged}"); ?>"><?php echo i18n::translate('Date registered'); ?></a></td>
<td class="descriptionbox wrap width20"><a href="<?php echo encode_url("useradmin.php?action=listusers&sort=sortllgn&filter={$filter}&usrlang={$usrlang}&ged={$ged}"); ?>"><?php echo i18n::translate('Last logged in'); ?></a></td>
<td class="descriptionbox wrap"><a href="<?php echo encode_url("useradmin.php?action=listusers&sort=sortver&filter={$filter}&usrlang={$usrlang}&ged={$ged}"); ?>"><?php echo i18n::translate('User verified himself'); ?></a></td>
- <td class="descriptionbox wrap"><a href="<?php echo encode_url("useradmin.php?action=listusers&sort=sortveradmin&filter={$filter}&usrlang={$usrlang}&ged={$ged}"); ?>"><?php echo i18n::translate('User approved by Admin'); ?></a></td>
+ <td class="descriptionbox wrap"><a href="<?php echo encode_url("useradmin.php?action=listusers&sort=sortveradmin&filter={$filter}&usrlang={$usrlang}&ged={$ged}"); ?>"><?php echo i18n::translate('User approved by admin'); ?></a></td>
<?php if ($view != "preview") {
echo "<td class=\"descriptionbox wrap\">";
echo i18n::translate('Delete'), "</td>";
@@ -771,7 +771,7 @@ if ($action == "createform") {
<td class="optionbox wrap"><input type="text" name="new_max_relation_path" tabindex="<?php echo ++$tab; ?>" value="0" size="5" /></td></tr>
<tr><td class="descriptionbox wrap"><?php echo i18n::translate('Email Address'), help_link('useradmin_email'); ?></td><td class="optionbox wrap"><input type="text" name="emailaddress" tabindex="<?php echo ++$tab; ?>" value="" size="50" /></td></tr>
<tr><td class="descriptionbox wrap"><?php echo i18n::translate('User verified himself'), help_link('useradmin_verified'); ?></td><td class="optionbox wrap"><input type="checkbox" name="verified" tabindex="<?php echo ++$tab; ?>" value="yes" checked="checked" /></td></tr>
- <tr><td class="descriptionbox wrap"><?php echo i18n::translate('User approved by Admin'), help_link('useradmin_verbyadmin'); ?></td><td class="optionbox wrap"><input type="checkbox" name="verified_by_admin" tabindex="<?php echo ++$tab; ?>" value="yes" checked="checked" /></td></tr>
+ <tr><td class="descriptionbox wrap"><?php echo i18n::translate('User approved by admin'), help_link('useradmin_verbyadmin'); ?></td><td class="optionbox wrap"><input type="checkbox" name="verified_by_admin" tabindex="<?php echo ++$tab; ?>" value="yes" checked="checked" /></td></tr>
<tr><td class="descriptionbox wrap"><?php echo i18n::translate('Change Language'), help_link('useradmin_change_lang'); ?></td><td class="optionbox wrap" valign="top"><?php
$tab++;