From 85fa4167d48b8614e860788cc822f4387634844b Mon Sep 17 00:00:00 2001 From: fisharebest Date: Thu, 9 Jun 2011 16:39:50 +0000 Subject: I18N: Improve English texts. Refer to sort options consistently. Remove "SHOW_MEDIA_FILENAME" configuration option, and use standardised behaviour. --- addmedia.php | 6 +-- admin_media.php | 6 +-- admin_pgv_to_wt.php | 1 - admin_trees_config.php | 9 ---- edit_interface.php | 4 +- fanchart.php | 52 ++++++++++----------- help_text.php | 10 ---- imageflush.php | 53 ++++++++++------------ includes/authentication.php | 66 +++++++++++++-------------- includes/functions/functions.php | 5 +- includes/functions/functions_mediadb.php | 16 +++---- includes/functions/functions_print_facts.php | 4 +- includes/functions/functions_print_lists.php | 4 +- includes/set_gedcom_defaults.php | 1 - library/WT/Controller/Media.php | 8 ++-- library/WT/GedcomRecord.php | 5 -- library/WT/Media.php | 4 +- library/WT/Report/Base.php | 68 ++++++++++++---------------- library/WT/Report/PDF.php | 58 +++++++++++------------- medialist.php | 6 +-- mediaviewer.php | 2 +- modules_v2/address_report/report.xml | 5 +- modules_v2/bdm_report/report.xml | 2 +- modules_v2/birth_report/report.xml | 2 +- modules_v2/cemetery_report/report.xml | 4 +- modules_v2/change_report/report.xml | 2 +- modules_v2/death_report/report.xml | 2 +- modules_v2/fact_sources/report.xml | 2 +- modules_v2/individual_ext_report/report.xml | 2 +- modules_v2/marriage_report/report.xml | 2 +- modules_v2/occupation_report/report.xml | 2 +- modules_v2/recent_changes/module.php | 8 ++-- modules_v2/relative_ext_report/report.xml | 2 +- modules_v2/relative_report/report.xml | 2 +- modules_v2/source_report/report.xml | 2 +- modules_v2/todays_events/module.php | 7 ++- modules_v2/upcoming_events/module.php | 7 ++- readme.html | 2 +- 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()) { - - - - - "; 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 @@ diff --git a/mediaviewer.php b/mediaviewer.php index ed153f4b10..60306bc7a4 100644 --- a/mediaviewer.php +++ b/mediaviewer.php @@ -98,7 +98,7 @@ global $tmb;
+ 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')); @@ -845,14 +844,6 @@ echo WT_JS_START;?>
- - - -
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': } ?> - +
@@ -2347,7 +2347,7 @@ case 'reorder_fams': ); - + ~", "", $name) . " " . WT_I18N::translate('Fan chart'); echo "

"; echo "\"$image_title\""; 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.

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.

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.

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. webtrees supports two different Soundex algorithms that produce vastly different results.

  • Basic
    This method, patented in 1918 by Russell, is very simple and can be done by hand.

    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 Smith will return not only Smith, Smid, Smit, Schmidt, Smyth, Smithe, Smithee, Schmitt, all of which are clearly variations of Smith, but also Smead, Sneed, Smoote, Sammett, Shand, and Snoddy.

  • Daitch-Mokotoff
    This method, developed in 1985, is much more complex than the Basic method and is not easily done by hand.

    A Soundex search using this method produces much more accurate results.
For details on both Soundex algorithms, visit this Jewish Genealogical Society web page.'); diff --git a/imageflush.php b/imageflush.php index a5cac4a03b..0353fae6ef 100644 --- a/imageflush.php +++ b/imageflush.php @@ -1,32 +1,27 @@ 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 ""; } - // 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 '
', htmlspecialchars($eventObj->getDetail()), '
'; break; case 'FILE': - if ($SHOW_MEDIA_FILENAME || WT_USER_GEDCOM_ADMIN) { + if (WT_USER_CAN_EDIT || WT_USER_IS_ADMIN) { echo '
', htmlspecialchars($eventObj->getDetail()), '
'; } 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 "getHtmlUrl(), "\" class=\"list_item name2\">"; echo ' '; echo PrintReady($name), ""; - if ($SHOW_MEDIA_FILENAME || WT_USER_IS_ADMIN) + if (WT_USER_CAN_EDIT || WT_USER_CAN_ACCEPT) echo "
getHtmlUrl(), "\">", basename($media->getFilename()), ""; if ($media->getNote()) echo "
", print_fact_notes("1 NOTE ".$media->getNote(), 1); echo "		 - + 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 @@ <var var="WT_I18N::translate('Address List')" /> - @@ -59,7 +58,7 @@ - + @@ -154,7 +153,7 @@ - +
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 @@ - + 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 @@ - + 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 @@ <var var="WT_I18N::translate('Cemetery Report')" /> - + @@ -34,7 +34,7 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@ <var var="WT_I18N::translate('Occupation report')" /> - + 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 ''; 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 @@ - + 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 @@ - + 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 @@ <var var="WT_I18N::translate('Sources report')" /> - + 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 ''; $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 ''; $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 webtrees, it is not
  • Go to your webtrees GEDCOM configuration page. On the line relating to this GEDCOM file click either IMPORT or UPLOAD.
  • Take careful note of the media items option ("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.") In most cases you should leave this box UNCHECKED.
  • Click "SAVE". webtrees will validate the GEDCOM again before importing.
    • -
  • 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. 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.
    • +
  • 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. 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.
    • -- cgit v1.3
    '; - echo /* I18N: label for a list box */WT_I18N::translate('Sort style'); //, help_link('sort_style'); + echo WT_I18N::translate('Sort order'); echo ''; 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 '
    '; - echo WT_I18N::translate('Sort style'); + echo WT_I18N::translate('Sort order'); echo ''; - 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 '
    '; - echo WT_I18N::translate('Sort style'); + echo WT_I18N::translate('Sort order'); echo ''; - 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 '