I18N: Improve English texts. Refer to sort options consistently. Remove "SHOW_MEDIA_FILENAME" configuration option, and use standardised behaviour.

38 files changed, 196 insertions, 247 deletions

diff --git a/addmedia.php b/addmedia.php
index f950dc29fa..258ed62aa4 100644
--- a/addmedia.php
+++ b/addmedia.php
@@ -159,7 +159,7 @@ if ($action=='newentry') {
 
 		$error = '';
 
-		// Determine file name on server
+		// Determine filename on server
 		if (WT_USER_GEDCOM_ADMIN && !empty($text[0])) $fileName = trim(trim($text[0]), '/');
 		else $fileName = '';
 		$parts = pathinfo_utf($fileName);
@@ -170,13 +170,13 @@ if ($action=='newentry') {
 				// Strip invalid extension from supplied name
 				$lastDot = strrpos($mediaFile, '.');
 				if ($lastDot !== false) $mediaFile = substr($mediaFile, 0, $lastDot);
-				// Use extension of original uploaded file name
+				// Use extension of original uploaded filename
 				if (!empty($_FILES['mediafile']['name'])) $parts = pathinfo_utf($_FILES['mediafile']['name']);
 				else $parts = pathinfo_utf($_FILES['thumbnail']['name']);
 				if (!empty($parts['extension'])) $mediaFile .= '.'.$parts['extension'];
 			}
 		} else {
-			// User did not specify a name to be used on the server:  use the original uploaded file name
+			// User did not specify a name to be used on the server:  use the original uploaded filename
 			if (!empty($_FILES['mediafile']['name'])) $parts = pathinfo_utf($_FILES['mediafile']['name']);
 			else $parts = pathinfo_utf($_FILES['thumbnail']['name']);
 			$mediaFile = $parts['basename'];
diff --git a/admin_media.php b/admin_media.php
index edbb5744ec..31e00f074f 100644
--- a/admin_media.php
+++ b/admin_media.php
@@ -784,10 +784,10 @@ if (check_media_structure()) {
 	<input type="hidden" name="subclick" value="<?php echo $subclick; ?>"/>
 	<table class="media_items <?php echo $TEXT_DIRECTION; ?>">
 		<tr align="center">
-			<td class="wrap"><?php echo WT_I18N::translate('Sequence'), help_link('sortby'); ?>
+			<td class="wrap"><?php echo /* I18N: Label for list of sort options */ WT_I18N::translate('Sort order'); ?>
 				<select name="sortby">
-					<option value="title" <?php if ($sortby=='title') echo "selected=\"selected\""; ?>><?php echo WT_Gedcom_Tag::getLabel('TITL'); ?></option>
-					<option value="file" <?php if ($sortby=='file') echo "selected=\"selected\""; ?>><?php echo WT_Gedcom_Tag::getLabel('FILE'); ?></option>
+					<option value="title" <?php if ($sortby=='title') echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('sort by title'); ?></option>
+					<option value="file" <?php if ($sortby=='file') echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('sort by filename'); ?></option>
 				</select>
 			</td>
 			<td class="wrap">
diff --git a/admin_pgv_to_wt.php b/admin_pgv_to_wt.php
index d76e663ce6..586fb94b7d 100644
--- a/admin_pgv_to_wt.php
+++ b/admin_pgv_to_wt.php
@@ -682,7 +682,6 @@ foreach (get_all_gedcoms() as $ged_id=>$gedcom) {
 	@set_gedcom_setting($ged_id, 'SHOW_LIVING_NAMES',            $SHOW_LIVING_NAMES);
 	@set_gedcom_setting($ged_id, 'SHOW_MARRIED_NAMES',           $SHOW_MARRIED_NAMES);
 	@set_gedcom_setting($ged_id, 'SHOW_MEDIA_DOWNLOAD',          $SHOW_MEDIA_DOWNLOAD);
-	@set_gedcom_setting($ged_id, 'SHOW_MEDIA_FILENAME',          $SHOW_MEDIA_FILENAME);
 	@set_gedcom_setting($ged_id, 'SHOW_PARENTS_AGE',             $SHOW_PARENTS_AGE);
 	@set_gedcom_setting($ged_id, 'SHOW_PEDIGREE_PLACES',         $SHOW_PEDIGREE_PLACES);
 	@set_gedcom_setting($ged_id, 'SHOW_PRIVATE_RELATIONSHIPS',   $SHOW_PRIVATE_RELATIONSHIPS);
diff --git a/admin_trees_config.php b/admin_trees_config.php
index 134f2298fe..baa58f7345 100644
--- a/admin_trees_config.php
+++ b/admin_trees_config.php
@@ -240,7 +240,6 @@ case 'update':
 	set_gedcom_setting(WT_GED_ID, 'SHOW_LIVING_NAMES',            safe_POST('SHOW_LIVING_NAMES'));
 	set_gedcom_setting(WT_GED_ID, 'SHOW_MARRIED_NAMES',           safe_POST_bool('NEW_SHOW_MARRIED_NAMES'));
 	set_gedcom_setting(WT_GED_ID, 'SHOW_MEDIA_DOWNLOAD',          safe_POST_bool('NEW_SHOW_MEDIA_DOWNLOAD'));
-	set_gedcom_setting(WT_GED_ID, 'SHOW_MEDIA_FILENAME',          safe_POST_bool('NEW_SHOW_MEDIA_FILENAME'));
 	set_gedcom_setting(WT_GED_ID, 'SHOW_NO_WATERMARK',            safe_POST('NEW_SHOW_NO_WATERMARK'));
 	set_gedcom_setting(WT_GED_ID, 'SHOW_PARENTS_AGE',             safe_POST_bool('NEW_SHOW_PARENTS_AGE'));
 	set_gedcom_setting(WT_GED_ID, 'SHOW_PEDIGREE_PLACES',         safe_POST('NEW_SHOW_PEDIGREE_PLACES'));
@@ -847,14 +846,6 @@ echo WT_JS_START;?>
 					</tr>
 					<tr>
 						<td>
-							<?php echo WT_I18N::translate('Show file name in media viewer'), help_link('SHOW_MEDIA_FILENAME'); ?>
-						</td>
-						<td>
-							<?php echo edit_field_yes_no('NEW_SHOW_MEDIA_FILENAME', get_gedcom_setting(WT_GED_ID, 'SHOW_MEDIA_FILENAME')); ?>
-						</td>
-					</tr>
-					<tr>
-						<td>
 							<?php echo WT_I18N::translate('Show download link in media viewer'), help_link('SHOW_MEDIA_DOWNLOAD'); ?>
 						</td>
 						<td>
diff --git a/edit_interface.php b/edit_interface.php
index 756e305b04..82d91c97d4 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -1984,7 +1984,7 @@ case 'reorder_children':
 		}
 		?>
 		<button type="submit"><?php echo WT_I18N::translate('Save'); ?></button>
-		<button type="submit" onclick="document.reorder_form.action.value='reorder_children'; document.reorder_form.submit();"><?php echo WT_I18N::translate('Sort by birth dates'); ?></button>
+		<button type="submit" onclick="document.reorder_form.action.value='reorder_children'; document.reorder_form.submit();"><?php echo WT_I18N::translate('sort by date of birth'); ?></button>
 		<button type="submit" onclick="window.close();"><?php echo WT_I18N::translate('Cancel'); ?></button>
 	</form>
 	<br />
@@ -2347,7 +2347,7 @@ case 'reorder_fams':
 			);
 		<?php echo WT_JS_END; ?>
 		<button type="submit"><?php echo WT_I18N::translate('Save'); ?></button>
-		<button type="submit" onclick="document.reorder_form.action.value='reorder_fams'; document.reorder_form.submit();"><?php echo WT_I18N::translate('Sort by marriage date'); ?></button>
+		<button type="submit" onclick="document.reorder_form.action.value='reorder_fams'; document.reorder_form.submit();"><?php echo WT_I18N::translate('sort by date of marriage'); ?></button>
 		<button type="submit" onclick="window.close();"><?php echo WT_I18N::translate('Cancel'); ?></button>
 	</form>
 	<?php
diff --git a/fanchart.php b/fanchart.php
index 38c21ea85c..29344504f2 100644
--- a/fanchart.php
+++ b/fanchart.php
@@ -1,31 +1,27 @@
 <?php
-/**
- * Displays a fan chart
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2010  PGV Development Team.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Charts
- * @version $Id$
- */
+// Displays a fan chart
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2010  PGV Development Team.  All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 define('WT_SCRIPT_NAME', 'fanchart.php');
 require './includes/session.php';
@@ -366,7 +362,7 @@ function print_fan_chart($treeid, $fanw=640, $fandeg=270) {
 	// step 2. call imageflush.php to read this session variable and display image
 	// note: arg "image_name=" is to avoid image miscaching
 	$image_name= "V".time();
-	unset($_SESSION[$image_name]); // statisticsplot.php uses this to hold a file name to send to browser
+	unset($_SESSION[$image_name]); // statisticsplot.php uses this to hold a filename to send to browser
 	$image_title=preg_replace("~<.*>~", "", $name) . " " . WT_I18N::translate('Fan chart');
 	echo "<p align=\"center\" >";
 	echo "<img src=\"imageflush.php?image_type=png&amp;image_name=$image_name&amp;height=$fanh&amp;width=$fanw\" width=\"$fanw\" height=\"$fanh\" border=\"0\" alt=\"$image_title\" title=\"$image_title\" usemap=\"#fanmap\" />";
diff --git a/help_text.php b/help_text.php
index 4f0672929d..02e8c2a669 100644
--- a/help_text.php
+++ b/help_text.php
@@ -1871,11 +1871,6 @@ case 'SHOW_MEDIA_DOWNLOAD':
 	$text=WT_I18N::translate('The Media Viewer can show a link which, when clicked, will download the Media file to the local PC.<br /><br />You may want to hide the download link for security reasons.');
 	break;
 
-case 'SHOW_MEDIA_FILENAME':
-	$title=WT_I18N::translate('Show file name in media viewer');
-	$text=WT_I18N::translate('The Media Viewer can show the name of the Media file being viewed.  This option determines whether that file name is shown to users or not.<br /><br />You may want to hide the file name for security reasons.');
-	break;
-
 case 'SHOW_NO_WATERMARK':
 	$title=WT_I18N::translate('Who can view non-watermarked images?');
 	$text=WT_I18N::translate('If the Media Firewall is enabled, users will see watermarks if they do not have the privilege level specified here.');
@@ -2879,11 +2874,6 @@ case 'skip_sublist':
 	$text=WT_I18N::translate('The standard setting is that, after you have clicked a letter of the Alphabetical index, you will get a sub-list with surnames.  If you click this link, all individuals with surnames that have the currently selected initial letter will be displayed immediately. Thereafter, the list of individuals will be displayed directly whenever you click on a new initial letter in the Alphabetical list.<br /><br />To reverse this action, click on the Show Surname lists link.');
 	break;
 
-case 'sortby':
-	$title=WT_I18N::translate('Sequence');
-	$text=WT_I18N::translate('Select the order in which you wish to see the list.');
-	break;
-
 case 'soundex_search':
 	$title=WT_I18N::translate('Search the way you think the name is written (Soundex)');
 	$text=WT_I18N::translate('Soundex is a method of coding words according to their pronunciation.  This allows you to search the database for names and places when you don\'t know precisely how they are written.  <b>webtrees</b> supports two different Soundex algorithms that produce vastly different results.<ul><li><b>Basic</b><br />This method, patented in 1918 by Russell, is very simple and can be done by hand.<br /><br />Because the Basic method retains the first letter of the name as part of the resultant code, it is not very helpful when you are unsure of that first letter.  The Basic algorithm is not well suited to names that were originally in languages other than English, and even with English names the results are very surprising.  For example, a Basic Soundex search for <b>Smith</b> will return not only <b>Smith, Smid, Smit, Schmidt, Smyth, Smithe, Smithee, Schmitt</b>, all of which are clearly variations of <b>Smith</b>, but also <b>Smead, Sneed, Smoote, Sammett, Shand,</b> and <b>Snoddy</b>.  <br /><br /></li><li><b>Daitch-Mokotoff</b><br />This method, developed in 1985, is much more complex than the Basic method and is not easily done by hand.<br /><br />A Soundex search using this method produces much more accurate results.</li></ul>For details on both Soundex algorithms, visit this <a href="http://www.jewishgen.org/infofiles/soundex.html" target=_blank><b>Jewish Genealogical Society</b></a> web page.');
diff --git a/imageflush.php b/imageflush.php
index a5cac4a03b..0353fae6ef 100644
--- a/imageflush.php
+++ b/imageflush.php
@@ -1,32 +1,27 @@
 <?php
-/**
- * Flush an image to the browser
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *
- * @package webtrees
- * @subpackage Charts
- * @version $Id$
- */
+// Flush an image to the browser
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 define('WT_SCRIPT_NAME', 'imageflush.php');
 require './includes/session.php';
@@ -54,7 +49,7 @@ if ($image_type=='jpg') {
 	$image_type='jpeg';
 }
 
-// Get name of SESSION variable containing an image file name
+// Get name of SESSION variable containing an image filename
 // These names are generated by WT
 $tempVarName=safe_GET('image_name', WT_REGEX_ALPHANUM, 'graphFile');
 
diff --git a/includes/authentication.php b/includes/authentication.php
index 048a9b49b1..bf85016595 100644
--- a/includes/authentication.php
+++ b/includes/authentication.php
@@ -1,38 +1,34 @@
 <?php
-/**
- * User and Authentication functions
- *
- * This file contains functions for working with users and authenticating them.
- * It also handles the internal mail messages, news/journal, and storage of My Page
- * customizations.  Assumes that a database connection has already been established.
- *
- * You can extend webtrees to work with other systems by implementing the functions in this file.
- * Other possible options are to use LDAP for authentication.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2010  PGV Development Team.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage DB
- * @version $Id$
- */
+// User and Authentication functions
+//
+// This file contains functions for working with users and authenticating them.
+// It also handles the internal mail messages, news/journal, and storage of My Page
+// customizations.  Assumes that a database connection has already been established.
+//
+// You can extend webtrees to work with other systems by implementing the functions in this file.
+// Other possible options are to use LDAP for authentication.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2010  PGV Development Team.  All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
@@ -483,7 +479,7 @@ function deleteNews($news_id) {
 /**
  * Gets the news items for the given user or gedcom
  *
- * @param String $username the username or gedcom file name to get news items for
+ * @param String $username the username or gedcom filename to get news items for
  */
 function getUserNews($username) {
 	$rows=
diff --git a/includes/functions/functions.php b/includes/functions/functions.php
index a8b42d9e5d..b9815d889d 100644
--- a/includes/functions/functions.php
+++ b/includes/functions/functions.php
@@ -269,7 +269,6 @@ function load_gedcom_settings($ged_id=WT_GED_ID) {
 	global $SHOW_LIVING_NAMES;            $SHOW_LIVING_NAMES            =get_gedcom_setting($ged_id, 'SHOW_LIVING_NAMES');
 	global $SHOW_MARRIED_NAMES;           $SHOW_MARRIED_NAMES           =get_gedcom_setting($ged_id, 'SHOW_MARRIED_NAMES');
 	global $SHOW_MEDIA_DOWNLOAD;          $SHOW_MEDIA_DOWNLOAD          =get_gedcom_setting($ged_id, 'SHOW_MEDIA_DOWNLOAD');
-	global $SHOW_MEDIA_FILENAME;          $SHOW_MEDIA_FILENAME          =get_gedcom_setting($ged_id, 'SHOW_MEDIA_FILENAME');
 	global $SHOW_NO_WATERMARK;            $SHOW_NO_WATERMARK            =get_gedcom_setting($ged_id, 'SHOW_NO_WATERMARK');
 	global $SHOW_PARENTS_AGE;             $SHOW_PARENTS_AGE             =get_gedcom_setting($ged_id, 'SHOW_PARENTS_AGE');
 	global $SHOW_PEDIGREE_PLACES;         $SHOW_PEDIGREE_PLACES         =get_gedcom_setting($ged_id, 'SHOW_PEDIGREE_PLACES');
@@ -1081,7 +1080,7 @@ function mediasort($a, $b) {
 	return utf8_strcasecmp($aKey, $bKey, true); // Case-insensitive compare
 }
 /**
- * sort an array according to the file name
+ * sort an array according to the filename
  *
  */
 
@@ -3352,7 +3351,7 @@ function pathinfo_utf($path) {
 		$basename=end($tmp);
 		$dirname=substr($path, 0, strlen($path) - strlen($basename) - 1);
 	} else {
-		$basename=$path; // We have just a file name
+		$basename=$path; // We have just a filename
 		$dirname='.';    // For compatibility with pathinfo()
 	}
 
diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php
index 00b64e890d..2b676dec66 100644
--- a/includes/functions/functions_mediadb.php
+++ b/includes/functions/functions_mediadb.php
@@ -662,7 +662,7 @@ function filterMedia($media, $filter, $acceptExt) {
 
 	$filter=utf8_strtoupper($filter);
 
-	//-- Accept when filter string contained in file name (but only for editing users)
+	//-- Accept when filter string contained in filename (but only for editing users)
 	if (WT_USER_CAN_EDIT && strstr(utf8_strtoupper(basename($media["FILE"])), $filter))
 		return true;
 
@@ -735,7 +735,7 @@ function filterMedia2($media, $filter, $acceptExt) {
 
 	$filter=utf8_strtoupper($filter);
 
-	//-- Accept when filter string contained in file name (but only for editing users)
+	//-- Accept when filter string contained in filename (but only for editing users)
 	if (WT_USER_CAN_EDIT && strstr(utf8_strtoupper(basename($mediaobject->getFilename())), $filter))
 		return true;
 
@@ -771,7 +771,7 @@ function filterMedia2($media, $filter, $acceptExt) {
 *
 * @author roland-d
 * @param string $filename The full filename of the media item
-* @param bool $generateThumb 'true' when thumbnail should be generated, 'false' when only the file name should be returned
+* @param bool $generateThumb 'true' when thumbnail should be generated, 'false' when only the filename should be returned
 * @param bool $overwrite 'true' to replace existing thumbnail
 * @return string the location of the thumbnail
 */
@@ -984,7 +984,7 @@ function display_silhouette(array $config = array()) {
 * takes a filename, split it in parts and then recreates it according to the
 * chosen media depth
 *
-* When the input file name is a URL, this routine does nothing.  Only http:// URLs
+* When the input filename is a URL, this routine does nothing.  Only http:// URLs
 * are supported.
 *
 * @author roland-d
@@ -1244,7 +1244,7 @@ function process_uploadMedia_form() {
 
 			$error = "";
 
-			// Determine file name on server
+			// Determine filename on server
 			$fileName = trim(trim(safe_POST('filename'.$i, WT_REGEX_NOSCRIPT)), '/');
 			$parts = pathinfo_utf($fileName);
 			if (!empty($parts["basename"])) {
@@ -1254,13 +1254,13 @@ function process_uploadMedia_form() {
 					// Strip invalid extension from supplied name
 					$lastDot = strrpos($mediaFile, '.');
 					if ($lastDot !== false) $mediaFile = substr($mediaFile, 0, $lastDot);
-					// Use extension of original uploaded file name
+					// Use extension of original uploaded filename
 					if (!empty($_FILES["mediafile".$i]["name"])) $parts = pathinfo_utf($_FILES["mediafile".$i]["name"]);
 					else $parts = pathinfo_utf($_FILES["thumbnail".$i]["name"]);
 					if (!empty($parts["extension"])) $mediaFile .= ".".$parts["extension"];
 				}
 			} else {
-				// User did not specify a name to be used on the server:  use the original uploaded file name
+				// User did not specify a name to be used on the server:  use the original uploaded filename
 				if (!empty($_FILES["mediafile".$i]["name"])) $parts = pathinfo_utf($_FILES["mediafile".$i]["name"]);
 				else $parts = pathinfo_utf($_FILES["thumbnail".$i]["name"]);
 				$mediaFile = $parts["basename"];
@@ -1537,7 +1537,7 @@ function show_media_form($pid, $action = "newentry", $filename = "", $linktoid =
 		}
 		else echo "<input type=\"hidden\" name=\"genthumb\" value=\"yes\" />";
 	}
-	// File name on server
+	// Filename on server
 	$isExternal = isFileExternal($gedfile);
 	if ($gedfile == "FILE") {
 		if (WT_USER_GEDCOM_ADMIN) {
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index 2ce4381e63..9e95238c95 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -34,7 +34,7 @@ define('WT_FUNCTIONS_PRINT_FACTS_PHP', '');
 
 // print a fact record, for the gedcom object pages.
 function print_fact(WT_Event $eventObj) {
-	global $HIDE_GEDCOM_ERRORS, $SHOW_FACT_ICONS, $SHOW_MEDIA_FILENAME, $SEARCH_SPIDER, $n_chil, $n_gchi;
+	global $HIDE_GEDCOM_ERRORS, $SHOW_FACT_ICONS, $n_chil, $n_gchi;
 
 	if (!$eventObj->canShow()) {
 		return;
@@ -223,7 +223,7 @@ function print_fact(WT_Event $eventObj) {
 		echo '<div class="field"><a href="mailto:', htmlspecialchars($eventObj->getDetail()), '">', htmlspecialchars($eventObj->getDetail()), '</a></div>';
 		break;
 	case 'FILE':
-		if ($SHOW_MEDIA_FILENAME || WT_USER_GEDCOM_ADMIN) {
+		if (WT_USER_CAN_EDIT || WT_USER_IS_ADMIN) {
 			echo '<div class="field">', htmlspecialchars($eventObj->getDetail()), '</div>';
 		}
 		break;
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index 38d2531a3e..e38ae95873 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -1026,7 +1026,7 @@ function print_repo_table($repos, $legend='') {
  * @param string $legend legend of the fieldset
  */
 function print_media_table($datalist, $legend) {
-	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION, $WT_IMAGES, $SHOW_MEDIA_FILENAME;
+	global $SHOW_LAST_CHANGE, $TEXT_DIRECTION, $WT_IMAGES;
 
 	if (count($datalist)<1) return;
 	require_once WT_ROOT.'js/sorttable.js.htm';
@@ -1064,7 +1064,7 @@ function print_media_table($datalist, $legend) {
 			echo "<a href=\"", $media->getHtmlUrl(), "\" class=\"list_item name2\">";
 			echo '<img src=', $media->getThumbnail(), ' height="15" /> ';
 			echo PrintReady($name), "</a>";
-			if ($SHOW_MEDIA_FILENAME || WT_USER_IS_ADMIN)
+			if (WT_USER_CAN_EDIT || WT_USER_CAN_ACCEPT)
 				echo "<br /><a href=\"", $media->getHtmlUrl(), "\">", basename($media->getFilename()), "</a>";
 			if ($media->getNote()) echo "<br />", print_fact_notes("1 NOTE ".$media->getNote(), 1);
 			echo "</td>";
diff --git a/includes/set_gedcom_defaults.php b/includes/set_gedcom_defaults.php
index a7239f571b..f3009c1553 100644
--- a/includes/set_gedcom_defaults.php
+++ b/includes/set_gedcom_defaults.php
@@ -118,7 +118,6 @@ set_gedcom_setting($ged_id, 'SHOW_LIST_PLACES',             '1');
 set_gedcom_setting($ged_id, 'SHOW_LIVING_NAMES',            WT_PRIV_USER);
 set_gedcom_setting($ged_id, 'SHOW_MARRIED_NAMES',           true);
 set_gedcom_setting($ged_id, 'SHOW_MEDIA_DOWNLOAD',          false);
-set_gedcom_setting($ged_id, 'SHOW_MEDIA_FILENAME',          false);
 set_gedcom_setting($ged_id, 'SHOW_NO_WATERMARK',            WT_PRIV_USER);
 set_gedcom_setting($ged_id, 'SHOW_PARENTS_AGE',             true);
 set_gedcom_setting($ged_id, 'SHOW_PEDIGREE_PLACES',         '9');
diff --git a/library/WT/Controller/Media.php b/library/WT/Controller/Media.php
index 982c2b5f39..df0e10cb06 100644
--- a/library/WT/Controller/Media.php
+++ b/library/WT/Controller/Media.php
@@ -21,7 +21,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-// @version $Id$
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
@@ -73,9 +73,9 @@ class WT_Controller_Media extends WT_Controller_Base {
 			}
 		}
 
-		//Checks to see if the File Name ($filename) exists
+		//Checks to see if the filename ($filename) exists
 		if (!empty($filename)) {
-			//If the File Name ($filename) is set, then it will call the method to get the Media ID ($this->mid) from the File Name ($filename)
+			//If the filename ($filename) is set, then it will call the method to get the Media ID ($this->mid) from the filename ($filename)
 			$this->mid = get_media_id_from_file($filename);
 			if (!$this->mid) {
 				//This will set the Media ID to be false if the File given doesn't match to anything in the database
@@ -360,7 +360,7 @@ class WT_Controller_Media extends WT_Controller_Base {
 	}
 
 	/**
-	* get the file name on the server
+	* get the filename on the server
 	* @return string
 	*/
 	function getServerFilename() {
diff --git a/library/WT/GedcomRecord.php b/library/WT/GedcomRecord.php
index c9a54ca336..b9b7cb02a0 100644
--- a/library/WT/GedcomRecord.php
+++ b/library/WT/GedcomRecord.php
@@ -578,11 +578,6 @@ class WT_GedcomRecord {
 		}
 	}
 
-	// Static helper function to sort an array of objects by ID
-	static function CompareId($x, $y) {
-		return strnatcasecmp($x->getXref(), $y->getXref());
-	}
-
 	// Static helper function to sort an array of objects by Change Date
 	static function CompareChanDate($x, $y) {
 		$chan_x = $x->getChangeEvent();
diff --git a/library/WT/Media.php b/library/WT/Media.php
index 81a1140b69..a5ee444cce 100644
--- a/library/WT/Media.php
+++ b/library/WT/Media.php
@@ -96,7 +96,7 @@ class WT_Media extends WT_GedcomRecord {
 	}
 
 	/**
-	 * get the main media file name
+	 * get the main media filename
 	 * @return string
 	 */
 	public function getFilename() {
@@ -118,7 +118,7 @@ class WT_Media extends WT_GedcomRecord {
 	}
 
 	/**
-	 * get the file name on the server, either in the standard or protected directory
+	 * get the filename on the server, either in the standard or protected directory
 	 * @param which string - specify either 'main' or 'thumb'
 	 * @return string
 	 */
diff --git a/library/WT/Report/Base.php b/library/WT/Report/Base.php
index f00277be31..0a10a912e2 100644
--- a/library/WT/Report/Base.php
+++ b/library/WT/Report/Base.php
@@ -1,35 +1,31 @@
 <?php
-/**
- * Base Report Generator
- *
- * used by the SAX parser to generate reports from the XML report file.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2011 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
- *
- * Modifications Copyright (c) 2010 Greg Roach
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Reports
- * @version $Id$
- */
+// Base Report Generator
+//
+// used by the SAX parser to generate reports from the XML report file.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// Modifications Copyright (c) 2010 Greg Roach
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
@@ -1071,7 +1067,7 @@ class PageHeader extends Element {
 */
 class Image extends Element {
 	/**
-	* File name of the image
+	* Filename of the image
 	* @var string
 	*/
 	public $file;
@@ -1109,7 +1105,7 @@ class Image extends Element {
 	/**
 	* Image class function - Base
 	*
-	* @param string $file File name of the image
+	* @param string $file Filename of the image
 	* @param float $x X-position (left) of the image
 	* @param float $y Y-position (top) of the image
 	* @param float $w Width of the image
@@ -3279,9 +3275,6 @@ function ListSHandler($attrs) {
 		case "NAME":
 			uasort($list, array("WT_GedcomRecord", "Compare"));
 			break;
-		case "ID":
-			uasort($list, array("WT_GedcomRecord", "CompareId"));
-			break;
 		case "CHAN":
 			uasort($list, array("WT_GedcomRecord", "CompareChanDate"));
 			break;
@@ -3507,9 +3500,6 @@ function RelativesSHandler($attrs) {
 		case "NAME":
 			uasort($list, array("WT_GedcomRecord", "Compare"));
 			break;
-		case "ID":
-			uasort($list, array("WT_GedcomRecord", "CompareId"));
-			break;
 		case "BIRT:DATE":
 			uasort($list, array("WT_Report_Base", "CompareBirthDate"));
 			break;
diff --git a/library/WT/Report/PDF.php b/library/WT/Report/PDF.php
index 92729dcb75..3a9b84e748 100644
--- a/library/WT/Report/PDF.php
+++ b/library/WT/Report/PDF.php
@@ -1,35 +1,29 @@
 <?php
-/**
- * PDF Report Generator
- *
- * used by the SAX parser to generate PDF reports from the XML report file.
- *
- * webtrees: Web based Family History software
- * Copyright (C) 2010 to 2011 webtrees development team.
- *
- * Derived from PhpGedView
- * Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @package webtrees
- * @subpackage Reports
- * @version $Id$
- * @link http://www.adobe.com/devnet/pdf/
- * @link http://www.tcpdf.org
- */
+// PDF Report Generator
+//
+// used by the SAX parser to generate PDF reports from the XML report file.
+//
+// webtrees: Web based Family History software
+// Copyright (C) 2011 webtrees development team.
+//
+// Derived from PhpGedView
+// Copyright (C) 2002 to 2009  PGV Development Team.  All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// $Id$
 
 if (!defined('WT_WEBTREES')) {
 	header('HTTP/1.0 403 Forbidden');
@@ -228,7 +222,7 @@ class WT_Report_PDF extends WT_Report_Base {
 
 	/**
 	* Create a new image object - WT_Report_PDF
-	* @param string $file File name
+	* @param string $file Filename
 	* @param mixed $x
 	* @param mixed $y
 	* @param int $w Image width
diff --git a/medialist.php b/medialist.php
index 56ca5e5a04..6bcd4035f0 100644
--- a/medialist.php
+++ b/medialist.php
@@ -200,13 +200,13 @@ $_SESSION['Medialist'] = $medialist;
 <!-- // NOTE: Row 1 right: -->
 	<!-- begin sort files -->
 			<td class="descriptionbox wrap width25">
-					<?php echo WT_I18N::translate('Sort by title or file name'), help_link('sortby'); ?>
+					<?php echo WT_I18N::translate('Sort order'); ?>
 			</td>
 			<td class="optionbox wrap width25"><select name="sortby">
 				<option value="title" <?php if ($sortby=='title') echo 'selected="selected"'; ?>>
-					<?php echo WT_I18N::translate('Sort by title'); ?></option>
+					<?php echo /* I18N: An option in a list-box */ WT_I18N::translate('sort by title'); ?></option>
 				<option value="file" <?php if ($sortby=='file') echo 'selected="selected"'; ?>>
-					<?php echo WT_I18N::translate('Sort by file name'); ?></option>
+					<?php echo /* I18N: An option in a list-box */ WT_I18N::translate('sort by filename'); ?></option>
 				</select>
 			</td>
 	<!-- //end sort files -->
diff --git a/mediaviewer.php b/mediaviewer.php
index ed153f4b10..60306bc7a4 100644
--- a/mediaviewer.php
+++ b/mediaviewer.php
@@ -98,7 +98,7 @@ global $tmb;
 					<td>
 						<table class="facts_table<?php echo $TEXT_DIRECTION=='ltr'?'':'_rtl'; ?>">
 							<?php
-								$facts = $controller->getFacts($SHOW_MEDIA_FILENAME);
+								$facts = $controller->getFacts(WT_USER_CAN_EDIT || WT_USER_CAN_ACCEPT);
 								foreach ($facts as $f=>$factrec) {
 									print_fact($factrec);
 								}
diff --git a/modules_v2/address_report/report.xml b/modules_v2/address_report/report.xml
index 275ffa9cc0..a869c8102a 100644
--- a/modules_v2/address_report/report.xml
+++ b/modules_v2/address_report/report.xml
@@ -4,7 +4,6 @@
 	<Title><var var="WT_I18N::translate('Address List')" /></Title>
 	<Description><var var="WT_I18N::translate('A report of addresses, telephone numbers, and email addresses.')" /></Description>
 	<Input name="address" type="text"><var var="WT_I18N::translate('Show addresses that contain:')" /> </Input>
-	<Input name="sortby" type="select" options="NAME=>WT_I18N::translate('Name')|ID=>WT_I18N::translate('ID number')"><var var="WT_I18N::translate('Sort by')" /></Input>
 	<Input name="email_in" type="select" options="all=>WT_I18N::translate('All addresses')|noemail=>WT_I18N::translate('Addresses without emails')|onlyemail=>WT_I18N::translate('Only addresses with emails')"><var var="WT_I18N::translate('Include:')"/> </Input>
 	<Input name="report_type" type="select" options="list=>WT_I18N::translate('List')|labels=>WT_I18N::translate('Address Labels')"><var var="WT_I18N::translate('Type')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
@@ -59,7 +58,7 @@
 						<SetVar name="email" value="" />
 					</if>
 				</if>
-				<List list="individual" filter1="$addrfilter" filter2="$addrfilter2" filter3="$email" sortby="$sortby">
+				<List list="individual" filter1="$addrfilter" filter2="$addrfilter2" filter3="$email" sortby="NAME">
 					<TextBox width="40" height="52" border="1">
 						<Text style="text"><GedcomValue tag="@id" /></Text>
 					</TextBox>
@@ -154,7 +153,7 @@
 				</if>
 				<SetVar name="X" value="$Xstart" />
 				<SetVar name="Y" value="$Ystart" />
-				<List list="individual" filter1="$addrfilter" filter2="$addrfilter2" filter3="$email" sortby="$sortby">
+				<List list="individual" filter1="$addrfilter" filter2="$addrfilter2" filter3="$email" sortby="NAME">
 					<TextBox top="$Y" left="$X" width="$width" height="$height" newline="$newline" pagecheck="false">
 						<Text style="label"><GetPersonName id="" /></Text>
 						<Text style="text"><br /><GedcomValue tag="ADDR" /><GedcomValue tag="RESI:ADDR" /></Text>
diff --git a/modules_v2/bdm_report/report.xml b/modules_v2/bdm_report/report.xml
index bbaeca9945..b811339c77 100644
--- a/modules_v2/bdm_report/report.xml
+++ b/modules_v2/bdm_report/report.xml
@@ -9,7 +9,7 @@
 	<Input name="birthdate2" lookup="DATE" type="text"><var var="WT_I18N::translate('Birth Date range end')" /></Input>
 	<Input name="deathdate1" lookup="DATE" type="text"><var var="WT_I18N::translate('Death Date range start')" /></Input>
 	<Input name="deathdate2" lookup="DATE" type="text"><var var="WT_I18N::translate('Death Date range end')" /></Input>
-	<Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>WT_I18N::translate('Name')|BIRT:DATE=>WT_I18N::translate('Date of birth')|DEAT:DATE=>WT_I18N::translate('Date of death')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')|DEAT:DATE=>WT_I18N::translate('sort by date of death')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
diff --git a/modules_v2/birth_report/report.xml b/modules_v2/birth_report/report.xml
index 3c0ecc5841..7a39b8c500 100644
--- a/modules_v2/birth_report/report.xml
+++ b/modules_v2/birth_report/report.xml
@@ -7,7 +7,7 @@
 	<Input name="birthplace" lookup="PLAC" type="text"><var var="WT_I18N::translate('Birth Place contains')" /></Input>
 	<Input name="birthdate1" lookup="DATE" type="text"><var var="WT_I18N::translate('Birth Date range start')" /></Input>
 	<Input name="birthdate2" lookup="DATE" type="text"><var var="WT_I18N::translate('Birth Date range end')" /></Input>
-	<Input name="sortby" type="select" default="NAME" options="none=>WT_I18N::translate('None')|NAME=>WT_I18N::translate('Name')|BIRT:DATE=>WT_I18N::translate('Date of birth')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="NAME" options="NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
diff --git a/modules_v2/cemetery_report/report.xml b/modules_v2/cemetery_report/report.xml
index 03f6106c55..7c841e3de7 100644
--- a/modules_v2/cemetery_report/report.xml
+++ b/modules_v2/cemetery_report/report.xml
@@ -4,7 +4,7 @@
 	<Title><var var="WT_I18N::translate('Cemetery Report')" /></Title>
 	<Description><var var="WT_I18N::translate('A report of people buried in a given place.')" /></Description>
 	<Input name="deathplace" lookup="PLAC" type="text"><var var="WT_I18N::translate('Burial Place contains')" /> </Input>
-	<Input name="sortby" type="select" default="NAME" options="none=>WT_I18N::translate('None')|ID=>WT_I18N::translate('ID number')|NAME=>WT_I18N::translate('Name')|DEAT:DATE=>WT_I18N::translate('Date of death')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="NAME" options="NAME=>WT_I18N::translate('sort by name')|DEAT:DATE=>WT_I18N::translate('sort by date of death')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="adlist" type="select" default="none" options="none=>WT_I18N::translate('None')|_MARNM=>WT_Gedcom_Tag::getLabel('_MARNM')|HUSB=>WT_I18N::translate('Husband')"><var var="WT_I18N::translate('Name List')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
@@ -34,7 +34,7 @@
 			<Cell align="rightrtl" newline="1" style="pagenum"><var var="WT_I18N::translate('Page')" /> <PageNum /> <var var="WT_I18N::translate('of')" /> <TotalPages /></Cell>
 
 			<SetVar name="fill" value="" />
-			<if condition="($sortby=='NAME') or ($sortby=='ID')"><SetVar name="fill" value="#AAAAAA" /></if>
+			<if condition="$sortby=='NAME'"><SetVar name="fill" value="#AAAAAA" /></if>
 			<TextBox bgcolor="$fill" border="1" width="$namewidth">
 				<Text style="label"><var var="WT_I18N::translate('Name')" /></Text>
 			</TextBox>
diff --git a/modules_v2/change_report/report.xml b/modules_v2/change_report/report.xml
index 5c74efc2d6..d4fb82395f 100644
--- a/modules_v2/change_report/report.xml
+++ b/modules_v2/change_report/report.xml
@@ -5,7 +5,7 @@
 	<Description><var var="WT_I18N::translate('A report of recent and pending changes.')" /></Description>
 	<Input name="changeRangeStart" lookup="DATE" type="text" default="NOW-30"><var var="WT_I18N::translate('Starting range of change dates')" /></Input>
 	<Input name="changeRangeEnd" lookup="DATE" type="text" default="NOW"><var var="WT_I18N::translate('Ending range of change dates')" /></Input>
-	<Input name="sortby" type="select" options="CHAN=>WT_I18N::translate('Last change')|NAME=>WT_I18N::translate('Name')|BIRT:DATE=>WT_I18N::translate('Date of birth')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="CHAN" options="CHAN=>WT_I18N::translate('sort by date')|NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pending" type="select" options="yes=>WT_I18N::translate('Yes')|no=>WT_I18N::translate('No')"><var var="WT_I18N::translate('Show pending changes')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="pageorient" type="select" default="landscape" options="landscape=>WT_I18N::translate('Landscape')|portrait=>WT_I18N::translate('Portrait')"><var var="WT_I18N::translate('Orientation')" /></Input>
diff --git a/modules_v2/death_report/report.xml b/modules_v2/death_report/report.xml
index 81d041a87c..b7d13da56a 100644
--- a/modules_v2/death_report/report.xml
+++ b/modules_v2/death_report/report.xml
@@ -7,7 +7,7 @@
 	<Input name="deathplace" lookup="PLAC" type="text"><var var="WT_I18N::translate('Death Place contains')" /></Input>
 	<Input name="deathdate1" lookup="DATE" type="text"><var var="WT_I18N::translate('Death Date range start')" /></Input>
 	<Input name="deathdate2" lookup="DATE" type="text"><var var="WT_I18N::translate('Death Date range end')" /></Input>
-	<Input name="sortby" type="select" default="NAME" options="none=>WT_I18N::translate('None')|NAME=>WT_I18N::translate('Name')|DEAT:DATE=>WT_I18N::translate('Date of death')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="NAME" options="NAME=>WT_I18N::translate('sort by name')|DEAT:DATE=>WT_I18N::translate('sort by date of death')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="adlist" type="select" default="none" options="none=>WT_I18N::translate('None')|_MARNM=>WT_Gedcom_Tag::getLabel('_MARNM')|HUSB=>WT_I18N::translate('Husband')"><var var="WT_I18N::translate('Name List')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
diff --git a/modules_v2/fact_sources/report.xml b/modules_v2/fact_sources/report.xml
index bdb0aa6383..f3df416efe 100644
--- a/modules_v2/fact_sources/report.xml
+++ b/modules_v2/fact_sources/report.xml
@@ -5,7 +5,7 @@
 	<Description><var var="WT_I18N::translate('A report of facts which are supported by a given source.')" /></Description>
 	<Input name="sid" lookup="SOUR" default="" type="text"><var var="WT_I18N::translate('Find Source ID')" /></Input>
 	<Input name="stype" type="select" default="facts" options="facts=>WT_I18N::translate('facts')|records=>WT_I18N::translate('records')"><var var="WT_I18N::translate('Source type')" /></Input>
-	<Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>WT_I18N::translate('Name')|BIRT:DATE=>WT_I18N::translate('Date of birth')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
diff --git a/modules_v2/individual_ext_report/report.xml b/modules_v2/individual_ext_report/report.xml
index c650f0b6e0..23ccbcdae2 100644
--- a/modules_v2/individual_ext_report/report.xml
+++ b/modules_v2/individual_ext_report/report.xml
@@ -6,7 +6,7 @@
 	<Input name="pid" type="text" default="" lookup="INDI"><var var="WT_I18N::translate('Enter Individual ID')"/></Input>
 	<Input name="relatives" type="select" options="child-family=>WT_I18N::translate('Parents and siblings')|spouse-family=>WT_I18N::translate('Spouses and children')|direct-ancestors=>WT_I18N::translate('Direct line ancestors')|ancestors=>WT_I18N::translate('Direct line ancestors and their families')|descendants=>WT_I18N::translate('Descendants')|all=>WT_I18N::translate('All')"><var var="WT_I18N::translate('Choose relatives')"/></Input>
 	<Input name="maxgen" type="select" default="4" options="*=>*|1=>1|2=>2|3=>3|4=>4|5=>5|6=>6|7=>7|8=>8|9=>9|10=>10"><var var="WT_I18N::translate('Generations')"/></Input>
-	<Input name="sortby" type="select" default="BIRT:DATE" options="none=>WT_I18N::translate('None')|BIRT:DATE=>WT_I18N::translate('Date of birth')|NAME=>WT_I18N::translate('Name')"><var var="WT_I18N::translate('Sort by')"/></Input>
+	<Input name="sortby" type="select" default="BIRT:DATE" options="BIRT:DATE=>WT_I18N::translate('sort by date of birth')|NAME=>WT_I18N::translate('sort by name')"><var var="WT_I18N::translate('Sort order')"/></Input>
 	<Input name="sources" type="checkbox" default="1"><var var="WT_I18N::translate('Show sources?')"/></Input>
 	<Input name="notes" type="checkbox" default="1"><var var="WT_I18N::translate('Show notes?')"/></Input>
 	<Input name="photos" type="select" default="highlighted" options="none=>WT_I18N::translate('None')|all=>WT_I18N::translate('All')|highlighted=>WT_I18N::translate('Highlighted image')"><var var="WT_I18N::translate('Show photos?')"/></Input>
diff --git a/modules_v2/marriage_report/report.xml b/modules_v2/marriage_report/report.xml
index 15d34dca35..a97cf769d3 100644
--- a/modules_v2/marriage_report/report.xml
+++ b/modules_v2/marriage_report/report.xml
@@ -7,7 +7,7 @@
 	<Input name="marrplace" lookup="PLAC" type="text"><var var="WT_I18N::translate('Marriage Place contains')" /> </Input>
 	<Input name="marrdate1" lookup="DATE" type="text"><var var="WT_I18N::translate('Marriage Date range start')" /></Input>
 	<Input name="marrdate2" lookup="DATE" type="text"><var var="WT_I18N::translate('Marriage Date range end')" /></Input>
-	<Input name="sortby" type="select" options="NAME=>WT_I18N::translate('Name')|MARR:DATE=>WT_Gedcom_Tag::getLabel('MARR:DATE')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="NAME" options="NAME=>WT_I18N::translate('sort by name')|MARR:DATE=>WT_I18N::translate('sort by date of marriage')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
diff --git a/modules_v2/occupation_report/report.xml b/modules_v2/occupation_report/report.xml
index 5ee6e35683..c3dea6dc34 100644
--- a/modules_v2/occupation_report/report.xml
+++ b/modules_v2/occupation_report/report.xml
@@ -4,7 +4,7 @@
 	<Title><var var="WT_I18N::translate('Occupation report')" /></Title>
 	<Description><var var="WT_I18N::translate('A report of people who had a given occupation.')" /></Description>
 	<Input name="occupation" lookup="OCCU" type="text"><var var="WT_Gedcom_Tag::getLabel('OCCU')" /> </Input>
-	<Input name="sortby" type="select" default="NAME" options="none=>WT_I18N::translate('None')|NAME=>WT_I18N::translate('Name')|BIRT:DATE=>WT_Gedcom_Tag::getLabel('BIRT:DATE')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="NAME" options="NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
diff --git a/modules_v2/recent_changes/module.php b/modules_v2/recent_changes/module.php
index d135b255c2..9d94c8c173 100644
--- a/modules_v2/recent_changes/module.php
+++ b/modules_v2/recent_changes/module.php
@@ -155,12 +155,12 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block {
 
 		$sortStyle = get_block_setting($block_id, 'sortStyle', 'date');
 		echo '<tr><td class="descriptionbox wrap width33">';
-		echo /* I18N: label for a list box */WT_I18N::translate('Sort style'); //, help_link('sort_style');
+		echo WT_I18N::translate('Sort order');
 		echo '</td><td class="optionbox">';
 		echo select_edit_control('sortStyle', array(
-			'name'      => /* I18N: a list-box option, for sorting */ WT_I18N::translate('alphabetically'),
-			'date_asc'  => /* I18N: a list-box option, for sorting */ WT_I18N::translate('oldest first'),
-			'date_desc' => /* I18N: a list-box option, for sorting */ WT_I18N::translate('newest first')
+			'name'      => /* I18N: An option in a list-box */ WT_I18N::translate('sort by name'),
+			'date_asc'  => /* I18N: An option in a list-box */ WT_I18N::translate('sort by date, oldest first'),
+			'date_desc' => /* I18N: An option in a list-box */ WT_I18N::translate('sort by date, newest first')
 		), null, $sortStyle, '');
 		echo '</td></tr>';
 
diff --git a/modules_v2/relative_ext_report/report.xml b/modules_v2/relative_ext_report/report.xml
index e608d0e34d..db502967bc 100644
--- a/modules_v2/relative_ext_report/report.xml
+++ b/modules_v2/relative_ext_report/report.xml
@@ -5,7 +5,7 @@
 	<Description><var var="WT_I18N::translate('A report of a person and details of their relatives.')" /></Description>
 	<Input name="pid" lookup="INDI" type="text"><var var="WT_I18N::translate('Enter Individual ID')" /></Input>
 	<Input name="relatives" type="select" options="child-family=>WT_I18N::translate('Parents and siblings')|spouse-family=>WT_I18N::translate('Spouses and children')|direct-ancestors=>WT_I18N::translate('Direct line ancestors')|ancestors=>WT_I18N::translate('Direct line ancestors and their families')|descendants=>WT_I18N::translate('Descendants')|all=>WT_I18N::translate('All')"><var var="WT_I18N::translate('Choose relatives')" /></Input>
-	<Input name="sortby" type="select" default="BIRT:DATE" options="none=>WT_I18N::translate('None')|NAME=>WT_I18N::translate('Name')|BIRT:DATE=>WT_I18N::translate('Date of birth')|DEAT:DATE=>WT_I18N::translate('Date of death')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')|DEAT:DATE=>WT_I18N::translate('sort by date of death')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
diff --git a/modules_v2/relative_report/report.xml b/modules_v2/relative_report/report.xml
index 6f9b9e308c..14af06066f 100644
--- a/modules_v2/relative_report/report.xml
+++ b/modules_v2/relative_report/report.xml
@@ -5,7 +5,7 @@
 	<Description><var var="WT_I18N::translate('A report of a person and a list of their relatives.')" /></Description>
 	<Input name="pid" lookup="INDI" type="text"><var var="WT_I18N::translate('Enter Individual ID')" /></Input>
 	<Input name="relatives" type="select" options="child-family=>WT_I18N::translate('Parents and siblings')|spouse-family=>WT_I18N::translate('Spouses and children')|direct-ancestors=>WT_I18N::translate('Direct line ancestors')|ancestors=>WT_I18N::translate('Direct line ancestors and their families')|descendants=>WT_I18N::translate('Descendants')|all=>WT_I18N::translate('All')"><var var="WT_I18N::translate('Choose relatives')" /></Input>
-	<Input name="sortby" type="select" default="BIRT:DATE" options="none=>WT_I18N::translate('None')|NAME=>WT_I18N::translate('Name')|BIRT:DATE=>WT_I18N::translate('Date of birth')|DEAT:DATE=>WT_I18N::translate('Date of death')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')|DEAT:DATE=>WT_I18N::translate('sort by date of death')"><var var="WT_I18N::translate('Sort by')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="pageorient" type="select" default="landscape" options="landscape=>WT_I18N::translate('Landscape')|portrait=>WT_I18N::translate('Portrait')"><var var="WT_I18N::translate('Orientation')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
diff --git a/modules_v2/source_report/report.xml b/modules_v2/source_report/report.xml
index ee12240ab5..765ef6640a 100644
--- a/modules_v2/source_report/report.xml
+++ b/modules_v2/source_report/report.xml
@@ -4,7 +4,7 @@
 	<Title><var var="WT_I18N::translate('Sources report')" /></Title>
 	<Description><var var="WT_I18N::translate('A report of individuals which are supported by a given source.')" /></Description>
 	<Input name="sid" lookup="SOUR" default="" type="text"><var var="WT_I18N::translate('Find Source ID')" /></Input>
-	<Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>WT_I18N::translate('Name')|BIRT:DATE=>WT_I18N::translate('Date of birth')|DEAT:DATE=>WT_I18N::translate('Date of death')"><var var="WT_I18N::translate('Sort by')" /></Input>
+	<Input name="sortby" type="select" default="BIRT:DATE" options="NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')|DEAT:DATE=>WT_I18N::translate('sort by date of death')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
diff --git a/modules_v2/todays_events/module.php b/modules_v2/todays_events/module.php
index 958cefa140..91e94935b7 100644
--- a/modules_v2/todays_events/module.php
+++ b/modules_v2/todays_events/module.php
@@ -150,9 +150,12 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 		$sortStyle=get_block_setting($block_id, 'sortStyle',  'alpha');
 		echo '<tr><td class="descriptionbox wrap width33">';
-		echo WT_I18N::translate('Sort style');
+		echo WT_I18N::translate('Sort order');
 		echo '</td><td class="optionbox">';
-		echo select_edit_control('sortStyle', array('alpha'=>WT_I18N::translate('alphabetically'), 'anniv'=>WT_I18N::translate('By Anniversary')), null, $sortStyle, '');
+		echo select_edit_control('sortStyle', array(
+			/* I18N: An option in a list-box */ 'alpha'=>WT_I18N::translate('sort by name'),
+			/* I18N: An option in a list-box */ 'anniv'=>WT_I18N::translate('sort by date'
+		)), null, $sortStyle, '');
 		echo '</td></tr>';
 
 		$block=get_block_setting($block_id, 'block', true);
diff --git a/modules_v2/upcoming_events/module.php b/modules_v2/upcoming_events/module.php
index 980b80168b..bf5fc14943 100644
--- a/modules_v2/upcoming_events/module.php
+++ b/modules_v2/upcoming_events/module.php
@@ -157,9 +157,12 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 		$sortStyle=get_block_setting($block_id, 'sortStyle',  'alpha');
 		echo '<tr><td class="descriptionbox wrap width33">';
-		echo WT_I18N::translate('Sort style');
+		echo WT_I18N::translate('Sort order');
 		echo '</td><td class="optionbox">';
-		echo select_edit_control('sortStyle', array('alpha'=>WT_I18N::translate('alphabetically'), 'anniv'=>WT_I18N::translate('By Anniversary')), null, $sortStyle, '');
+		echo select_edit_control('sortStyle', array(
+			/* I18N: An option in a list-box */ 'alpha'=>WT_I18N::translate('sort by name'),
+			/* I18N: An option in a list-box */ 'anniv'=>WT_I18N::translate('sort by date')
+		), null, $sortStyle, '');
 		echo '</td></tr>';
 
 		$block=get_block_setting($block_id, 'block', true);
diff --git a/readme.html b/readme.html
index 545287982e..e9eb1e910a 100644
--- a/readme.html
+++ b/readme.html
@@ -146,7 +146,7 @@ When or if you change your genealogy data outside of <b>webtrees</b>, it is not
 	<li> Go to your <b>webtrees</b> GEDCOM configuration page. On the line relating to this GEDCOM file click either IMPORT or UPLOAD.</li>
 	<li>Take careful note of the media items option (<i>"If you have created media objects in webtrees, and have edited your gedcom off-line using a program that deletes media objects, then tick this box to merge the current media objects with the new GEDCOM."</i>) In most cases you should leave this box <b>UNCHECKED</b>.</li>
 	<li>Click "SAVE". <b>webtrees</b> will validate the GEDCOM again before importing.</li>
-	<li><strike>You can use a ZIP file to upload the GEDCOM, but only if you use the UPLOAD option. The file name can be anything you choose.</strike> NOTE: The ability to upload ZIP files does not currently work. If your GEDCOM file is too large to upload, you should use the IMPORT option.</li>
+	<li><strike>You can use a ZIP file to upload the GEDCOM, but only if you use the UPLOAD option. The filename can be anything you choose.</strike> NOTE: The ability to upload ZIP files does not currently work. If your GEDCOM file is too large to upload, you should use the IMPORT option.</li>
 </ol>
 <hr width="100%">
 <!-- SECURITY -->